diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 5d69dfe4e071..2ae77cf01421 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -7,7 +7,7 @@ name: "Label PR"
 
 on:
   schedule:
-    - cron: '37 * * * *'
+    - cron: '07,17,27,37,47,57 * * * *'
   workflow_call:
   workflow_dispatch:
     inputs:
@@ -36,10 +36,15 @@ jobs:
   labels:
     name: label-pr
     runs-on: ubuntu-24.04-arm
-    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
+    if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
       - name: Install dependencies
-        run: npm install @actions/artifact
+        run: npm install @actions/artifact bottleneck
+
+      - name: Log current API rate limits
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh api /rate_limit | jq
 
       - name: Labels from API data and Eval results
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -47,12 +52,41 @@ jobs:
           UPDATED_WITHIN: ${{ inputs.updatedWithin }}
         with:
           script: |
+            const Bottleneck = require('bottleneck')
             const path = require('node:path')
             const { DefaultArtifactClient } = require('@actions/artifact')
             const { readFile } = require('node:fs/promises')
 
             const artifactClient = new DefaultArtifactClient()
 
+            const stats = {
+              prs: 0,
+              requests: 0,
+              artifacts: 0
+            }
+
+            // Rate-Limiting and Throttling, see for details:
+            //   https://github.com/octokit/octokit.js/issues/1069#throttling
+            //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
+            const allLimits = new Bottleneck({
+              // Avoid concurrent requests
+              maxConcurrent: 1,
+              // Hourly limit is at 5000, but other jobs need some, too!
+              // https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api
+              reservoir: 1000,
+              reservoirRefreshAmount: 1000,
+              reservoirRefreshInterval: 60 * 60 * 1000
+            })
+            // Pause between mutative requests
+            const writeLimits = new Bottleneck({ minTime: 1000 }).chain(allLimits)
+            github.hook.wrap('request', async (request, options) => {
+              stats.requests++
+              if (['POST', 'PUT', 'PATCH', 'DELETE'].includes(options.method))
+                return writeLimits.schedule(request.bind(null, options))
+              else
+                return allLimits.schedule(request.bind(null, options))
+            })
+
             if (process.env.UPDATED_WITHIN && !/^\d+$/.test(process.env.UPDATED_WITHIN))
               throw new Error('Please enter "updated within" as integer in hours.')
 
@@ -90,7 +124,7 @@ jobs:
               base: context.payload.pull_request.base.ref
             }
 
-            await github.paginate(
+            const prs = await github.paginate(
               github.rest.pulls.list,
               {
                 ...context.repo,
@@ -99,12 +133,17 @@ jobs:
                 direction: 'desc',
                 ...prEventCondition
               },
-              async (response, done) => (await Promise.allSettled(response.data.map(async (pull_request) => {
+              (response, done) => response.data.map(async (pull_request) => {
                 try {
-                  const log = (k,v) => core.info(`PR #${pull_request.number} - ${k}: ${v}`)
+                  const log = (k,v,skip) => {
+                    core.info(`PR #${pull_request.number} - ${k}: ${v}` + (skip ? ' (skipped)' : ''))
+                    return skip
+                  }
 
-                  log('Last updated at', pull_request.updated_at)
-                  if (new Date(pull_request.updated_at) < cutoff) return done()
+                  if (log('Last updated at', pull_request.updated_at, new Date(pull_request.updated_at) < cutoff))
+                    return done()
+                  stats.prs++
+                  log('URL', pull_request.html_url)
 
                   const run_id = (await github.rest.actions.listWorkflowRuns({
                     ...context.repo,
@@ -118,8 +157,8 @@ jobs:
 
                   // Newer PRs might not have run Eval to completion, yet. We can skip them, because this
                   // job will be run as part of that Eval run anyway.
-                  log('Last eval run', run_id)
-                  if (!run_id) return;
+                  if (log('Last eval run', run_id ?? '<pending>', !run_id))
+                    return;
 
                   const artifact = (await github.rest.actions.listWorkflowRunArtifacts({
                     ...context.repo,
@@ -129,8 +168,12 @@ jobs:
 
                   // Instead of checking the boolean artifact.expired, we will give us a minute to
                   // actually download the artifact in the next step and avoid that race condition.
-                  log('Artifact expires at', artifact.expires_at)
-                  if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return;
+                  // Older PRs, where the workflow run was already eval.yml, but the artifact was not
+                  // called "comparison", yet, will be skipped as well.
+                  const expired = new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)
+                  if (log('Artifact expires at', artifact?.expires_at ?? '<not found>', expired))
+                    return;
+                  stats.artifacts++
 
                   await artifactClient.downloadArtifact(artifact.id, {
                     findBy: {
@@ -163,7 +206,7 @@ jobs:
 
                   const maintainers = new Set(Object.keys(
                     JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8'))
-                  ))
+                  ).map(m => Number.parseInt(m, 10)))
 
                   // And the labels that should be there
                   const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
@@ -192,10 +235,14 @@ jobs:
                 } catch (cause) {
                   throw new Error(`Labeling PR #${pull_request.number} failed.`, { cause })
                 }
-              })))
+              })
+            );
+
+            (await Promise.allSettled(prs.flat()))
               .filter(({ status }) => status == 'rejected')
               .map(({ reason }) => core.setFailed(`${reason.message}\n${reason.cause.stack}`))
-            )
+
+            core.notice(`Processed ${stats.prs} PRs, made ${stats.requests + stats.artifacts} API requests and downloaded ${stats.artifacts} artifacts.`)
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         name: Labels from touched files
diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md
index edaea5895a3b..223c47f2e684 100644
--- a/doc/hooks/installShellFiles.section.md
+++ b/doc/hooks/installShellFiles.section.md
@@ -84,7 +84,7 @@ zsh).
 }
 ```
 
-The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which
+The path may also be the result of process substitution (e.g. `<(cmd)`), in which
 case the shell and name must be provided (see below).
 
 If the destination shell completion file is not actually present or consists of
@@ -100,7 +100,7 @@ failure. To prevent this, guard the completion generation commands.
 {
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    # using named fd
+    # using process substitution
     installShellCompletion --cmd foobar \
       --bash <($out/bin/foobar --bash-completion) \
       --fish <($out/bin/foobar --fish-completion) \
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 91d2ee0d551a..e327eb43ea40 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -879,399 +879,6 @@ stdenv.mkDerivation (finalAttrs: {
 })
 ```
 
-### buildDenoPackage {#javascript-buildDenoPackage}
-
-`buildDenoPackage` allows you to package [Deno](https://deno.com/) projects in Nixpkgs without the use of an auto-generated dependencies file (as used in [node2nix](#javascript-node2nix)).
-It works by utilizing Deno's cache functionality -- creating a reproducible cache that contains the dependencies of a project, and pointing Deno to it.
-
-#### buildDenoDeps {#javascript-buildDenoPackage-buildDenoDeps}
-
-For every `buildDenoPackage`, first, a [fixed output derivation](https://nix.dev/manual/nix/2.18/language/advanced-attributes.html#adv-attr-outputHash) is
-created with all the dependencies mentioned in the `deno.lock`.
-This works as follows:
-1. They are installed using `deno install`.
-1. All non-reproducible data is pruned.
-1. The directories `.deno`, `node_modules` and `vendor` are copied to `$out`.
-1. The output of the FOD is checked against the `denoDepsHash`.
-1. The output is copied into the build of `buildDenoPackage`, which is not an FOD.
-1. The dependencies are installed again using `deno install`, this time from the local cache only.
-
-The `buildDenoDeps` derivation is in `passthru`, so it can be accessed from a `buildDenoPackage` derivation with `.denoDeps`
-
-Related options:
-
-*`denoDepsHash`* (String)
-
-: The output hash of the `buildDenoDeps` fixed output derivation.
-
-*`denoInstallFlags`* (Array of strings; optional)
-
-: The Flags passed to `deno install`.
-
-: _Default:_ `[ "--allow-scripts" "--frozen" "--cached-only" ]` for `buildDenoPackage`
-: _Default:_ `[ "--allow-scripts" "--frozen" ]` for `buildDenoDeps` (`"--cached-only"` is filtered out)
-
-::: {.tip}
-If you receive errors like these:
-
-```
-error: The lockfile is out of date. Run `deno install --frozen=false`, or rerun with `--frozen=false` to update it.
-```
-
-or
-
-```
-error: Import '<url>' failed.
-    0: error sending request for url (<url>): client error (Connect): dns error: failed to lookup address information: Temporary failure in name resolution: failed to lookup address information:Temporary failure in name resolution
-    1: client error (Connect)
-    2: dns error: failed to lookup address information: Temporary failure in name resolution
-    3: failed to lookup address information: Temporary failure in name resolution
-    at file:///build/source/src/lib/helpers/verifyRequest.ts:2:21
-build for <your-package> failed in buildPhase with exit code 1
-```
-
-or
-
-```
-error: Specifier not found in cache: "<url>", --cached-only is specified.
-
-ERROR: deno failed to install dependencies
-```
-
-This can happen due to the `deno install` command deducing different packages than what the actual package needs.
-
-To fix this, add the entrypoint to the install flags:
-
-```nix
-{ buildDenoPackage, nix-gitignore }:
-buildDenoPackage {
-  pname = "myPackage";
-  version = "0.1.0";
-  denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-  src = nix-gitignore.gitignoreSource [ ] ./.;
-  binaryEntrypointPath = "main.ts";
-  denoInstallFlags = [
-    "--allow-scripts"
-    "--frozen"
-    "--cached-only"
-    "--entrypoint"
-    "<path/to/entrypoint/script>"
-  ];
-}
-```
-
-:::
-
-#### Private registries {#javascript-buildDenoPackage-private-registries}
-There are currently 2 options, which enable the use of private registries in a `buildDenoPackage` derivation.
-
-*`denoDepsImpureEnvVars`* (Array of strings; optional)
-
-: Names of impure environment variables passed to the `buildDenoDeps` derivation. They are forwarded to `deno install`.
-
-: _Example:_ `[ "NPM_TOKEN" ]`
-
-: It can be used to set tokens for private NPM registries (in a `.npmrc` file).
-
-: In a single-user installation of Nix, you can put the variables into the environment, when running the nix build.
-
-: In multi-user installations of Nix, it's necessary to set the environment variables in the nix-daemon, probably with systemd.
-
-:::{.example}
-
-##### configure nix-daemon {#javascript-buildDenoPackage-private-registries-daemon-example}
-In NixOS:
-
-```nix
-# configuration.nix
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  systemd.services.nix-daemon.environment.NPM_TOKEN = "<token>";
-}
-```
-
-In other Linux distributions use
-
-```
-$ sudo systemctl edit nix-daemon
-$ sudo systemctl cat nix-daemon
-$ sudo systemctl restart nix-daemon
-```
-
-:::
-
-*`denoDepsInjectedEnvVars`* (Attrset; optional)
-
-: Environment variables as key value pairs. They are forwarded to `deno install`.
-
-: _Example:_ `{ "NPM_TOKEN" = "<token>"; }`
-
-: It can be used to set tokens for private NPM registries (in a `.npmrc` file).
-You could pass these tokens from the Nix CLI with `--arg`,
-however this can hurt the reproducibility of your builds and such an injected
-token will also need to be injected in every build that depends on this build.
-
-:::{.example}
-
-##### example `.npmrc` {#javascript-buildDenoPackage-private-registries-npmrc-example}
-
-```ini
-@<scope>:registry=https://<domain>/<path to private registry>
-//<domain>/<path to private registry>:_authToken=${NPM_TOKEN}
-```
-
-:::
-
-::: {.caution}
-
-Hardcoding a token into your NixOS configuration or some other nix build, will as a consequence write that token into `/nix/store`, which is considered world readable.
-
-:::
-
-::: {.note}
-Neither approach is ideal. For `buildNpmPackage`, there exists a third
-option called `sourceOverrides`, which allows the user to inject Nix packages into
-the output `node_modules` folder.
-Since a Nix build implicitly uses the SSH keys of the machine,
-this offers a third option to access private packages.
-But this creates the requirement, that the imported package is packaged with nix first,
-and that the source code can be retrieved with SSH.
-This is possible for Deno, too, albeit it not
-completely analogous to `buildNpmPackage`'s solution.
-However, it has not been implemented yet.
-:::
-
-#### Compile to binary {#javascript-buildDenoPackage-compile-to-binary}
-
-It's possible to compile a Deno project to a single binary using `deno compile`.
-The binary will be named like the `.name` property in `deno.json`, if available,
-or the `name` attribute of the derivation.
-
-:::{.caution}
-When using packages with a `npm:` specifier, the resulting binary will not be reproducible.
-See [this issue](https://github.com/denoland/deno/issues/29619) for more information.
-:::
-
-Related options:
-
-*`hostPlatform`* (String; optional)
-
-: The [host platform](#ssec-cross-platform-parameters) the binary is built for.
-
-: _Default:_ `builtins.currentSystem`.
-
-: _Supported values:_
-  - `"x86_64-darwin"`
-  - `"aarch64-darwin"`
-  - `"x86_64-linux"`
-  - `"aarch64-linux"`
-
-*`denoCompileFlags`* (Array of string; optional)
-
-: Flags passed to `deno compile [denoTaskFlags] ${binaryEntrypointPath} [extraCompileFlags]`.
-
-*`extraCompileFlags`* (Array of string; optional)
-
-: Flags passed to `deno compile [denoTaskFlags] ${binaryEntrypointPath} [extraCompileFlags]`.
-
-*`binaryEntrypointPath`* (String or null; optional)
-
-: If not `null`, a binary is created using the specified path as the entry point.
-The binary is copied to `$out/bin` in the `installPhase`.
-
-: _Default:_ `null`
-
-: It's prefixed by `denoWorkspacePath`.
-
-*`denortPackage`* (Derivation; optional)
-
-: The package used as the Deno runtime, which is bundled with the JavaScript code to create the binary.
-
-: _Default:_ `pkgs.denort`
-
-: Don't use `pkgs.deno` for this, since that is the full Deno CLI, with all the development tooling.
-
-: If you're cross compiling, this needs to be the `denort` of the `hostPlatform`.
-
-::: {.note}
-The binary will be dynamically linked and not executable on NixOS without [nix-ld](https://github.com/nix-community/nix-ld)
-or [other methods](https://unix.stackexchange.com/questions/522822/different-methods-to-run-a-non-nixos-executable-on-nixos).
-
-```nix
-# configuration.nix
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    glibc
-    gcc-unwrapped
-  ];
-}
-```
-
-:::
-
-:::{.example}
-
-##### example binary build {#javascript-buildDenoPackage-compile-to-binary-example}
-
-```nix
-{ buildDenoPackage, nix-gitignore }:
-buildDenoPackage {
-  pname = "myPackage";
-  version = "0.1.0";
-  denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-  src = nix-gitignore.gitignoreSource [ ] ./.;
-  binaryEntrypointPath = "main.ts";
-}
-```
-
-:::
-
-#### Create artifacts in the build {#javascript-buildDenoPackage-artifacts-in-build}
-
-Instead of compiling to a binary, `deno task` can be executed inside the build
-to produce some artifact, which can then be copied out in the `installPhase`.
-
-Related options:
-
-*`denoTaskScript`* (String; optional)
-
-: The task in `deno.json` that's executed with `deno task`.
-
-: _Default:_ `"build"`
-
-*`denoTaskFlags`* (Array of strings; optional)
-
-: The flags passed to `deno task [denoTaskFlags] ${denoTaskScript} [extraTaskFlags]`.
-
-*`extraTaskFlags`* (Array of strings; optional)
-
-: The flags passed to `deno task [denoTaskFlags] ${denoTaskScript} [extraTaskFlags]`.
-
-*`denoTaskPrefix`* (String; optional)
-
-: An unquoted string injected before `deno task`.
-
-*`denoTaskSuffix`* (String; optional)
-
-: An unquoted string injected after `deno task` and all its flags. For example to pipe stdout to a file.
-
-:::{.example}
-
-##### example artifact build {#javascript-buildDenoPackage-artifacts-in-build-example}
-
-`deno.json`
-
-```json
-{
-    "tasks": {
-        "build": "deno run --allow-all main.ts"
-    }
-}
-```
-
-```nix
-{ buildDenoPackage, nix-gitignore }:
-buildDenoPackage {
-  pname = "myPackage";
-  version = "0.1.0";
-  denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-  src = nix-gitignore.gitignoreSource [ ] ./.;
-  denoTaskSuffix = ">out.txt";
-  installPhase = ''
-    cp ./out.txt $out
-  '';
-}
-```
-
-:::
-
-#### Workspaces {#javascript-buildDenoPackage-workspaces}
-
-Deno's workspaces are supported.
-
-To make them work, the whole project needs to be added as source, since the `deno.lock`
-is always in the root of the project and contains all dependencies.
-
-This means a build with only the required dependencies of a workspace is not possible.
-Also, the `denoDepsHash` for all workspaces is the same, since they
-all share the same dependencies.
-
-When [running a task inside the build](#javascript-buildDenoPackage-artifacts-in-build),
-`denoWorkspacePath` can be used to let the task run inside a workspace.
-
-When [compiling to a binary](#javascript-buildDenoPackage-compile-to-binary),
-`binaryEntrypointPath` is prefixed by `denoWorkspacePath`.
-
-Related options:
-
-*`denoWorkspacePath`* (String; optional)
-
-: The path to a workspace.
-
-:::{.example}
-
-##### example workspaces {#javascript-buildDenoPackage-workspaces-example}
-
-```nix
-{ buildDenoPackage, nix-gitignore }:
-rec {
-  sub1 = buildDenoPackage {
-    pname = "sub1";
-    version = "0.1.0";
-    denoDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
-    src = nix-gitignore.gitignoreSource [ ] ./.;
-    denoWorkspacePath = "./sub1";
-    denoTaskFlags = [
-      "--text"
-      "sub1"
-    ];
-    denoTaskSuffix = ">out.txt";
-    installPhase = ''
-      cp out.txt $out
-    '';
-  };
-  sub2 = buildDenoPackage {
-    # Note that we are reusing denoDeps and src,
-    # since they must be the same for both workspaces.
-    inherit (sub1) denoDeps src;
-    pname = "sub2";
-    version = "0.1.0";
-    denoWorkspacePath = "./sub2";
-    binaryEntrypointPath = "./main.ts";
-  };
-}
-```
-
-:::
-
-#### Other Options {#javascript-buildDenoPackage-other-options}
-
-*`denoDir`* (String; optional)
-
-: `DENO_DIR` will be set to this value for all `deno` commands.
-
-*`denoFlags`* (Array of string; optional)
-
-: The flags passed to all `deno` commands.
-
-*`denoPackage`* (Derivation; optional)
-
-: The Deno CLI used for all `deno` commands inside the build.
-
-: _Default:_ `pkgs.deno`
-
 ## Outside Nixpkgs {#javascript-outside-nixpkgs}
 
 There are some other tools available, which are written in the Nix language.
diff --git a/doc/redirects.json b/doc/redirects.json
index 61756f44c902..7fb27ab4ced1 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3390,42 +3390,6 @@
   "javascript-nix-npm-buildpackage-pitfalls": [
     "index.html#javascript-nix-npm-buildpackage-pitfalls"
   ],
-  "javascript-buildDenoPackage-workspaces-example": [
-    "index.html#javascript-buildDenoPackage-workspaces-example"
-  ],
-  "javascript-buildDenoPackage-private-registries": [
-    "index.html#javascript-buildDenoPackage-private-registries"
-  ],
-  "javascript-buildDenoPackage-buildDenoDeps": [
-    "index.html#javascript-buildDenoPackage-buildDenoDeps"
-  ],
-  "javascript-buildDenoPackage-artifacts-in-build": [
-    "index.html#javascript-buildDenoPackage-artifacts-in-build"
-  ],
-  "javascript-buildDenoPackage-artifacts-in-build-example": [
-    "index.html#javascript-buildDenoPackage-artifacts-in-build-example"
-  ],
-  "javascript-buildDenoPackage-private-registries-daemon-example": [
-    "index.html#javascript-buildDenoPackage-private-registries-daemon-example"
-  ],
-  "javascript-buildDenoPackage-private-registries-npmrc-example": [
-    "index.html#javascript-buildDenoPackage-private-registries-npmrc-example"
-  ],
-  "javascript-buildDenoPackage-compile-to-binary-example": [
-    "index.html#javascript-buildDenoPackage-compile-to-binary-example"
-  ],
-  "javascript-buildDenoPackage-workspaces": [
-    "index.html#javascript-buildDenoPackage-workspaces"
-  ],
-  "javascript-buildDenoPackage": [
-    "index.html#javascript-buildDenoPackage"
-  ],
-  "javascript-buildDenoPackage-other-options": [
-    "index.html#javascript-buildDenoPackage-other-options"
-  ],
-  "javascript-buildDenoPackage-compile-to-binary": [
-    "index.html#javascript-buildDenoPackage-compile-to-binary"
-  ],
   "language-julia": [
     "index.html#language-julia"
   ],
diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 01d952655ad5..11d54b19159f 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -551,8 +551,6 @@
 
 - `ddclient` was updated from 3.11.2 to 4.0.0 [Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
 
-- `buildDenoPackage` was added [see docs](https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/javascript.section.md#avascript-buildDenoPackage) for more details
-
 ## Nixpkgs Library {#sec-nixpkgs-release-25.05-lib}
 
 ### Breaking changes {#sec-nixpkgs-release-25.05-lib-breaking}
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 92c90acda4ae..1cd2bd89c6f7 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -18,6 +18,7 @@
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
+- `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.
 
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
 
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4ca444cecfd5..459af64996ca 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1648,6 +1648,12 @@
     github = "angaz";
     githubId = 10219618;
   };
+  angelodlfrtr = {
+    name = "Angelo Delefortrie";
+    email = "angelo.delefortrie@gmail.com";
+    github = "angelodlfrtr";
+    githubId = 5405598;
+  };
   angristan = {
     email = "angristan@pm.me";
     github = "angristan";
@@ -3432,12 +3438,6 @@
     githubId = 75451918;
     name = "Charlie Root";
   };
-  bluescreen303 = {
-    email = "mathijs@bluescreen303.nl";
-    github = "bluescreen303";
-    githubId = 16330;
-    name = "Mathijs Kwik";
-  };
   blusk = {
     email = "bluskript@gmail.com";
     github = "bluskript";
@@ -11632,6 +11632,13 @@
     githubId = 110620;
     name = "Jevin Maltais";
   };
+  jezcope = {
+    email = "j.cope@erambler.co.uk";
+    github = "jezcope";
+    githubId = 457628;
+    name = "Jez Cope";
+    keys = [ { fingerprint = "D9DA 3E47 E8BD 377D A317  B3D0 9E42 CE07 1C45 59D1"; } ];
+  };
   jfchevrette = {
     email = "jfchevrette@gmail.com";
     github = "jfchevrette";
@@ -14288,6 +14295,12 @@
     githubId = 75130626;
     keys = [ { fingerprint = "80EE AAD8 43F9 3097 24B5  3D7E 27E9 7B91 E63A 7FF8"; } ];
   };
+  link00000000 = {
+    email = "crandall.logan@gmail.com";
+    github = "link00000000";
+    githubId = 9771505;
+    name = "Logan Crandall";
+  };
   link2xt = {
     email = "link2xt@testrun.org";
     githubId = 18373967;
@@ -20068,6 +20081,12 @@
     githubId = 24578572;
     name = "Blake North";
   };
+  powwu = {
+    name = "powwu";
+    email = "hello@powwu.sh";
+    github = "powwu";
+    githubId = 20643401;
+  };
   poz = {
     name = "Jacek Poziemski";
     email = "poz@poz.pet";
diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py
index d7e3ec899bb1..e3b687cba025 100755
--- a/maintainers/scripts/kde/collect-missing-deps.py
+++ b/maintainers/scripts/kde/collect-missing-deps.py
@@ -62,6 +62,9 @@ OK_MISSING_BY_PACKAGE = {
     "krfb": {
         "Qt6XkbCommonSupport",  # not real
     },
+    "ksystemstats": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
     "kuserfeedback": {
         "Qt6Svg",  # all used for backend console stuff we don't ship
         "QmlLint",
@@ -75,6 +78,9 @@ OK_MISSING_BY_PACKAGE = {
         "display-info",  # newer versions identify as libdisplay-info
         "Libcap",  # used to call setcap at build time and nothing else
     },
+    "kwin-x11": {
+        "Libcap",  # used to call setcap at build time and nothing else
+    },
     "libksysguard": {
         "Libcap",  # used to call setcap at build time and nothing else
     },
@@ -84,6 +90,12 @@ OK_MISSING_BY_PACKAGE = {
     },
     "plasma-desktop": {
         "scim",  # upstream is dead, not packaged in Nixpkgs
+        "KAccounts6",  # dead upstream
+        "AccountsQt6",  # dead upstream
+        "signon-oauth2plugin",  # dead upstream
+    },
+    "plasma-dialer": {
+        "KTactileFeedback",  # dead?
     },
     "poppler-qt6": {
         "gobject-introspection-1.0",  # we don't actually want to build the GTK variant
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 47c5e0de3f8b..40ee958a0a49 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -33,10 +33,16 @@ in
 
     enable = lib.mkOption {
       type = lib.types.bool;
-      default = true;
+      default = false;
       description = ''
         Whether interactive shells should show which Nix package (if
         any) provides a missing command.
+
+        Requires nix-channels to be set and downloaded (sudo nix-channels --update.)
+
+        See also nix-index and nix-index-database as an alternative for flakes-based systems.
+
+        Additionally, having the env var NIX_AUTO_RUN set will automatically run the matching package, and with NIX_AUTO_RUN_INTERACTIVE it will confirm the package before running.
       '';
     };
 
@@ -54,47 +60,24 @@ in
 
   config = lib.mkIf cfg.enable {
     programs.bash.interactiveShellInit = ''
-      # This function is called whenever a command is not found.
       command_not_found_handle() {
-        local p='${commandNotFound}/bin/command-not-found'
-        if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then
-          # Run the helper program.
-          "$p" "$@"
-          # Retry the command if we just installed it.
-          if [ $? = 126 ]; then
-            "$@"
-          else
-            return 127
-          fi
-        else
-          echo "$1: command not found" >&2
-          return 127
-        fi
+        '${commandNotFound}/bin/command-not-found' "$@"
       }
     '';
 
     programs.zsh.interactiveShellInit = ''
-      # This function is called whenever a command is not found.
       command_not_found_handler() {
-        local p='${commandNotFound}/bin/command-not-found'
-        if [ -x "$p" ] && [ -f '${cfg.dbPath}' ]; then
-          # Run the helper program.
-          "$p" "$@"
-
-          # Retry the command if we just installed it.
-          if [ $? = 126 ]; then
-            "$@"
-          else
-            return 127
-          fi
-        else
-          # Indicate than there was an error so ZSH falls back to its default handler
-          echo "$1: command not found" >&2
-          return 127
-        fi
+        '${commandNotFound}/bin/command-not-found' "$@"
       }
     '';
 
+    # NOTE: Fish by itself checks for nixos command-not-found, let's instead makes it explicit.
+    programs.fish.interactiveShellInit = ''
+      function fish_command_not_found
+         "${commandNotFound}/bin/command-not-found" $argv
+      end
+    '';
+
     environment.systemPackages = [ commandNotFound ];
   };
 
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl
index 72e246c81ae9..64f0f1a49877 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixos/modules/programs/command-not-found/command-not-found.pl
@@ -10,6 +10,24 @@ my $program = $ARGV[0];
 
 my $dbPath = "@dbPath@";
 
+if (! -e $dbPath) {
+    print STDERR "$program: command not found\n";
+    print STDERR "\n";
+    print STDERR "command-not-found: Missing package database\n";
+    print STDERR "command-not-found is a tool for searching for missing packages.\n";
+    print STDERR "No database was found, this likely means the database hasn't been generated yet.\n";
+    print STDERR "This tool requires nix-channels to generate the database for the `nixos` channel.\n";
+    print STDERR "\n";
+    print STDERR "If you are using nix-channels you can run:\n";
+    print STDERR "    sudo nix-channels --update\n";
+    print STDERR "\n";
+    print STDERR "If you are using flakes, see nix-index and nix-index-database.\n";
+    print STDERR "\n";
+    print STDERR "If you would like to disable this message you can set:\n";
+    print STDERR "    programs.command-not-found.enable = false;\n";
+    exit 127;
+}
+
 my $dbh = DBI->connect("dbi:SQLite:dbname=$dbPath", "", "")
     or die "cannot open database `$dbPath'";
 $dbh->{RaiseError} = 0;
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index e1256c9672f2..a83918efc7cc 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -21,7 +21,10 @@ To enable PostgreSQL, add the following to your {file}`configuration.nix`:
   services.postgresql.package = pkgs.postgresql_15;
 }
 ```
-Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL.
+
+The default PostgreSQL version is approximately the latest major version available on the NixOS release matching your [`system.stateVersion`](#opt-system.stateVersion).
+This is because PostgreSQL upgrades require a manual migration process (see below).
+Hence, upgrades must happen by setting [`services.postgresql.package`](#opt-services.postgresql.package) explicitly.
 
 <!--
 After running {command}`nixos-rebuild`, you can verify
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 48ff4c2a48ef..dc8b05b46458 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -120,8 +120,22 @@ in
 
       enableJIT = mkEnableOption "JIT support";
 
-      package = mkPackageOption pkgs "postgresql" {
-        example = "postgresql_15";
+      package = mkOption {
+        type = types.package;
+        example = literalExpression "pkgs.postgresql_15";
+        defaultText = literalExpression ''
+          if versionAtLeast config.system.stateVersion "24.11" then
+            pkgs.postgresql_16
+          else if versionAtLeast config.system.stateVersion "23.11" then
+            pkgs.postgresql_15
+          else if versionAtLeast config.system.stateVersion "22.05" then
+            pkgs.postgresql_14
+          else
+            pkgs.postgresql_13
+        '';
+        description = ''
+          The package being used by postgresql.
+        '';
       };
 
       finalPackage = mkOption {
@@ -656,6 +670,7 @@ in
             See also https://endoflife.date/postgresql
           '';
         base =
+          # XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date!
           if versionAtLeast config.system.stateVersion "24.11" then
             pkgs.postgresql_16
           else if versionAtLeast config.system.stateVersion "23.11" then
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 187b14b71b57..57b38f81f0f3 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -62,9 +62,11 @@ in
         packages = (
           with pkgs;
           [
-            ayatana-indicator-datetime # Clock
             ayatana-indicator-session # Controls for shutting down etc
           ]
+          ++ (with lomiri; [
+            lomiri-indicator-datetime # Clock
+          ])
         );
       };
     })
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index f6be4413fc7d..ef9c66d1336d 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -156,8 +156,10 @@ in
         ];
         optionalPackages =
           [
+            aurorae
             plasma-browser-integration
             konsole
+            kwin-x11
             (lib.getBin qttools) # Expose qdbus in PATH
             ark
             elisa
@@ -339,8 +341,35 @@ in
         capabilities = "cap_sys_nice+ep";
         source = "${lib.getBin pkgs.kdePackages.kwin}/bin/kwin_wayland";
       };
+
+      ksystemstats_intel_helper = {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_perfmon+ep";
+        source = "${pkgs.kdePackages.ksystemstats}/libexec/ksystemstats_intel_helper";
+      };
+
+      ksgrd_network_helper = {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_net_raw+ep";
+        source = "${pkgs.kdePackages.libksysguard}/libexec/ksysguard/ksgrd_network_helper";
+      };
     };
 
+    # Upstream recommends allowing set-timezone and set-ntp so that the KCM and
+    # the automatic timezone logic work without user interruption.
+    # However, on NixOS NTP cannot be overwritten via dbus, and timezone
+    # can only be set if `time.timeZone` is set to `null`. So, we only allow
+    # set-timezone, and we only allow it when the timezone can actually be set.
+    security.polkit.extraConfig = lib.mkIf (config.time.timeZone != null) ''
+      polkit.addRule(function(action, subject) {
+        if (action.id == "org.freedesktop.timedate1.set-timezone" && subject.active) {
+          return polkit.Result.YES;
+        }
+      });
+    '';
+
     programs.dconf.enable = true;
 
     programs.firefox.nativeMessagingHosts.packages = [ kdePackages.plasma-browser-integration ];
diff --git a/nixos/modules/services/misc/renovate.nix b/nixos/modules/services/misc/renovate.nix
index 503aed8fdb91..5539f17db4c6 100644
--- a/nixos/modules/services/misc/renovate.nix
+++ b/nixos/modules/services/misc/renovate.nix
@@ -61,6 +61,27 @@ in
       };
       default = { };
     };
+    environment = mkOption {
+      type =
+        with types;
+        attrsOf (
+          nullOr (oneOf [
+            str
+            path
+            package
+          ])
+        );
+      description = ''
+        Extra environment variables to export to the Renovate process
+        from the systemd unit configuration.
+
+        See https://docs.renovatebot.com/config-overview for available environment variables.
+      '';
+      example = {
+        LOG_LEVEL = "debug";
+      };
+      default = { };
+    };
     runtimePackages = mkOption {
       type = with types; listOf package;
       description = "Packages available to renovate.";
@@ -82,14 +103,22 @@ in
       description = ''
         Renovate's global configuration.
         If you want to pass secrets to renovate, please use {option}`services.renovate.credentials` for that.
+
+        See https://docs.renovatebot.com/config-overview for available settings.
       '';
     };
   };
 
   config = mkIf cfg.enable {
-    services.renovate.settings = {
-      cacheDir = "/var/cache/renovate";
-      baseDir = "/var/lib/renovate";
+    services.renovate = {
+      settings = {
+        cacheDir = "/var/cache/renovate";
+        baseDir = "/var/lib/renovate";
+      };
+      environment = {
+        RENOVATE_CONFIG_FILE = generateConfig "renovate-config.json" cfg.settings;
+        HOME = "/var/lib/renovate";
+      };
     };
 
     systemd.services.renovate = {
@@ -101,6 +130,7 @@ in
         config.systemd.package
         pkgs.git
       ] ++ cfg.runtimePackages;
+      inherit (cfg) environment;
 
       serviceConfig = {
         User = "renovate";
@@ -145,11 +175,6 @@ in
         )}
         exec ${lib.escapeShellArg (lib.getExe cfg.package)}
       '';
-
-      environment = {
-        RENOVATE_CONFIG_FILE = generateConfig "renovate-config.json" cfg.settings;
-        HOME = "/var/lib/renovate";
-      };
     };
   };
 }
diff --git a/nixos/modules/services/networking/firezone/gui-client.nix b/nixos/modules/services/networking/firezone/gui-client.nix
index 8ddb4223111f..129a43e492ca 100644
--- a/nixos/modules/services/networking/firezone/gui-client.nix
+++ b/nixos/modules/services/networking/firezone/gui-client.nix
@@ -6,7 +6,6 @@
 }:
 let
   inherit (lib)
-    boolToString
     getExe'
     mkEnableOption
     mkIf
@@ -28,7 +27,7 @@ in
         default = [ ];
         description = ''
           All listed users will become part of the `firezone-client` group so
-          they can control the IPC service. This is a convenience option.
+          they can control the tunnel service. This is a convenience option.
         '';
       };
 
@@ -58,8 +57,8 @@ in
     # Required for the token store in the gui application
     services.gnome.gnome-keyring.enable = true;
 
-    systemd.services.firezone-ipc-service = {
-      description = "GUI IPC service for the Firezone zero-trust access platform";
+    systemd.services.firezone-tunnel-service = {
+      description = "GUI tunnel service for the Firezone zero-trust access platform";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
@@ -73,7 +72,7 @@ in
           export FIREZONE_ID=$(< client_id)
         fi
 
-        exec ${getExe' cfg.package "firezone-client-ipc"} run
+        exec ${getExe' cfg.package "firezone-client-tunnel"} run
       '';
 
       environment = {
diff --git a/nixos/tests/ayatana-indicators.nix b/nixos/tests/ayatana-indicators.nix
index 3c11740ae036..7efbc3d5f160 100644
--- a/nixos/tests/ayatana-indicators.nix
+++ b/nixos/tests/ayatana-indicators.nix
@@ -42,6 +42,7 @@ in
             ayatana-indicator-sound
           ]
           ++ (with pkgs.lomiri; [
+            lomiri-indicator-datetime
             lomiri-indicator-network
             lomiri-telephony-service
           ]);
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 2b4b0fbe6a50..e0174d4dd345 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -12,7 +12,6 @@ in
 {
   name = "mongodb";
   meta.maintainers = with pkgs.lib.maintainers; [
-    bluescreen303
     offline
     phile314
     niklaskorz
diff --git a/nixos/tests/nixos-rebuild-target-host.nix b/nixos/tests/nixos-rebuild-target-host.nix
index 4c3e894a6977..480963fa1bf1 100644
--- a/nixos/tests/nixos-rebuild-target-host.nix
+++ b/nixos/tests/nixos-rebuild-target-host.nix
@@ -57,7 +57,7 @@
           users.users.alice.extraGroups = [ "wheel" ];
           users.users.bob.extraGroups = [ "wheel" ];
 
-          # Disable sudo for root to ensure sudo isn't called without `--use-remote-sudo`
+          # Disable sudo for root to ensure sudo isn't called without `--sudo`
           security.sudo.extraRules = lib.mkForce [
             {
               groups = [ "wheel" ];
@@ -170,20 +170,20 @@
       # Ensure sudo is disabled for root
       target.fail("sudo true")
 
-      # This test also ensures that sudo is not called without --use-remote-sudo
+      # This test also ensures that sudo is not called without --sudo
       with subtest("Deploy to root@target"):
         deployer.succeed("nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console")
         target_hostname = deployer.succeed("ssh alice@target cat /etc/hostname").rstrip()
         assert target_hostname == "config-1-deployed", f"{target_hostname=}"
 
       with subtest("Deploy to alice@target with passwordless sudo"):
-        deployer.succeed("nixos-rebuild switch -I nixos-config=/root/configuration-2.nix --target-host alice@target --use-remote-sudo &>/dev/console")
+        deployer.succeed("nixos-rebuild switch -I nixos-config=/root/configuration-2.nix --target-host alice@target --sudo &>/dev/console")
         target_hostname = deployer.succeed("ssh alice@target cat /etc/hostname").rstrip()
         assert target_hostname == "config-2-deployed", f"{target_hostname=}"
 
       with subtest("Deploy to bob@target with password based sudo"):
         # TODO: investigate why --ask-sudo-password from nixos-rebuild-ng is not working here
-        deployer.succeed(r'${lib.optionalString withNg "NIX_SSHOPTS=-t "}passh -c 3 -C -p ${nodes.target.users.users.bob.password} -P "\[sudo\] password" nixos-rebuild switch -I nixos-config=/root/configuration-3.nix --target-host bob@target --use-remote-sudo &>/dev/console')
+        deployer.succeed(r'${lib.optionalString withNg "NIX_SSHOPTS=-t "}passh -c 3 -C -p ${nodes.target.users.users.bob.password} -P "\[sudo\] password" nixos-rebuild switch -I nixos-config=/root/configuration-3.nix --target-host bob@target --sudo &>/dev/console')
         target_hostname = deployer.succeed("ssh alice@target cat /etc/hostname").rstrip()
         assert target_hostname == "config-3-deployed", f"{target_hostname=}"
 
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 56eab79bba4f..027aab52109d 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -56,13 +56,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mixxx";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
     rev = version;
-    hash = "sha256-s66XrcMGgA8KvBDxljg95nbKW1pIv8rJJ+DyxirHwDo=";
+    hash = "sha256-dKk3n3KDindnLbON52SW5h4cz96WVi0OPjwA27HqQCI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix
index 1270c10059c6..f99fa36c3b37 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/applications/audio/noson/default.nix
@@ -8,19 +8,20 @@
   qtbase,
   qtgraphicaleffects,
   qtquickcontrols2,
+  qtwayland,
   wrapQtAppsHook,
   makeWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "noson";
-  version = "5.6.10";
+  version = "5.6.13";
 
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
     rev = finalAttrs.version;
-    hash = "sha256-ERlZtQTwPu5Y1i5cV9c5IMSJW30ootjmFix0EiF+/x0=";
+    hash = "sha256-XJBkPhyDPeyVrcY5Q5W9LtESuVxcbcQ8JoyOzKg+0NU=";
   };
 
   nativeBuildInputs = [
@@ -29,13 +30,17 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper
   ];
 
-  buildInputs = [
-    flac
-    libpulseaudio
-    qtbase
-    qtgraphicaleffects
-    qtquickcontrols2
-  ];
+  buildInputs =
+    [
+      flac
+      libpulseaudio
+      qtbase
+      qtgraphicaleffects
+      qtquickcontrols2
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+    ];
 
   # wrapQtAppsHook doesn't automatically find noson-gui
   dontWrapQtApps = true;
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index e371605d341f..2d3e52da3b63 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -19,11 +19,11 @@
 
 mkDerivation rec {
   pname = "okteta";
-  version = "0.26.21";
+  version = "0.26.22";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-tuYvcfcxdX1nzTR603rEYIgXLEjnZH3mDRJUD/BVRJs=";
+    sha256 = "sha256-vi7XhMj/PaMeK4V6FxU7Yi7XyWMaOBUenafZPpaP+n0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index b51ff99c10b0..4130d533d7eb 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18827,6 +18827,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-moonfly-colors = buildVimPlugin {
+    pname = "vim-moonfly-colors";
+    version = "2025-05-28";
+    src = fetchFromGitHub {
+      owner = "bluz71";
+      repo = "vim-moonfly-colors";
+      rev = "ff822100c5d268e0db79e8e725cbd3ade3470de3";
+      sha256 = "14ffclg7yjkyw05bdqwc7rmzf195vjswfpmcfi7sd85rr4d3midz";
+    };
+    meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-move = buildVimPlugin {
     pname = "vim-move";
     version = "2023-10-08";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 860ce0bc9942..b6d004ea7b52 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1445,6 +1445,7 @@ https://github.com/delroth/vim-molokai-delroth/,HEAD,
 https://github.com/crusoexia/vim-monokai/,,
 https://github.com/phanviet/vim-monokai-pro/,,
 https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
+https://github.com/bluz71/vim-moonfly-colors/,HEAD,
 https://github.com/matze/vim-move/,,
 https://github.com/lifepillar/vim-mucomplete/,,
 https://github.com/terryma/vim-multiple-cursors/,,
diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md
index 09de650067fc..3977dc5a3e13 100644
--- a/pkgs/applications/editors/vscode/extensions/README.md
+++ b/pkgs/applications/editors/vscode/extensions/README.md
@@ -2,10 +2,10 @@
 
 ## Conventions for adding new extensions
 
-* Extensions are named in the **lowercase** version of the extension's unique identifier. Which is found on the marketplace extension page, and is the name under which the extension is installed by VSCode under `~/.vscode`.
+* Extensions are named in the **lowercase** version of the extension's unique identifier which is found on the extension's marketplace page, and is the name under which the extension is installed by VSCode under `~/.vscode`.
   Extension location should be: ${lib.strings.toLower mktplcRef.publisher}.${lib.string.toLower mktplcRef.name}
 
-* Move extension to a discrete directory whenever the extension needs extra parameters/packages (at top of the file) or other files (such as patches, update script, components). Global index file parameters/packages should be utilities shared by many extensions. Extension specific parameters/packages should not be in the global index page.
+* When adding a new extension, place its definition in a `default.nix` file in a directory with the extension's ID (e.g. `publisher.extension-name/default.nix`) and refer to it in `./default.nix`, e.g. `publisher.extension-name = callPackage ./publisher.extension-name { };`.
 
 * Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions.
 
@@ -39,4 +39,4 @@
       > vscode-extensions.publisher.extension-name: 1.2.3 -> 2.3.4
       >
       > Release: https://github.com/owner/project/releases/tag/2.3.4
-  - Multiple extensions can be added in a single PR, but each extension requires it's own commit.
+  - Multiple extensions can be added in a single PR, but each extension requires its own commit.
diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index b83f1d3cb757..d23940e88854 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.516";
-    hash = "sha256-0RBydQ2+ec6Swj/DGYVen3g8a6SqhIKLZ9m1Bohjqco=";
+    version = "2.0.519";
+    hash = "sha256-Ndgps72L1mT7a2xoBmeXm/iAbyFMXP+e8SuQ5Q7HqcI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index c48a154d39e0..b86cbb7d8bdf 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -12,7 +12,7 @@ let
     {
       buildGoModule,
       version,
-      sha256,
+      hash,
       vendorHash,
       license,
       ...
@@ -21,7 +21,7 @@ let
       attrs' = builtins.removeAttrs attrs [
         "buildGoModule"
         "version"
-        "sha256"
+        "hash"
         "vendorHash"
         "license"
       ];
@@ -37,9 +37,15 @@ let
           owner = "hashicorp";
           repo = pname;
           rev = "v${version}";
-          inherit sha256;
+          inherit hash;
         };
 
+        # Nomad requires Go 1.24.4, but nixpkgs doesn't have it in unstable yet.
+        postPatch = ''
+          substituteInPlace go.mod \
+            --replace-warn "go 1.24.4" "go 1.24.3"
+        '';
+
         nativeBuildInputs = [ installShellFiles ];
 
         ldflags = [
@@ -59,7 +65,7 @@ let
         '';
 
         meta = with lib; {
-          homepage = "https://www.nomadproject.io/";
+          homepage = "https://developer.hashicorp.com/nomad";
           description = "Distributed, Highly Available, Datacenter-Aware Scheduler";
           mainProgram = "nomad";
           inherit license;
@@ -81,12 +87,24 @@ rec {
   # Upstream partially documents used Go versions here
   # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md
 
-  nomad = nomad_1_9;
+  nomad = nomad_1_10;
+
+  nomad_1_10 = generic {
+    buildGoModule = buildGo124Module;
+    version = "1.10.2";
+    hash = "sha256-7i/tMQwaEmLGXNarrdPzmorv+SHrxCzeaF3BI9Jjhwg=";
+    vendorHash = "sha256-yq8xQ9wThPK/X9/lEHD8FCXq1Mrz0lO6UvrP2ipXMnw=";
+    license = lib.licenses.bsl11;
+    passthru.tests.nomad = nixosTests.nomad;
+    preCheck = ''
+      export PATH="$PATH:$NIX_BUILD_TOP/go/bin"
+    '';
+  };
 
   nomad_1_9 = generic {
     buildGoModule = buildGo124Module;
     version = "1.9.7";
-    sha256 = "sha256-U02H6DPr1friQ9EwqD/wQnE2Fm20OE5xNccPDJfnsqI=";
+    hash = "sha256-U02H6DPr1friQ9EwqD/wQnE2Fm20OE5xNccPDJfnsqI=";
     vendorHash = "sha256-9GnwqkexJAxrhW9yJFaDTdSaZ+p+/dcMuhlusp4cmyw=";
     license = lib.licenses.bsl11;
     passthru.tests.nomad = nixosTests.nomad;
diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index 18555d053545..01b661171aca 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -68,14 +68,14 @@
 
 stdenv.mkDerivation rec {
   pname = "jami";
-  version = "20250523.0";
+  version = "20250613.0";
 
   src = fetchFromGitLab {
     domain = "git.jami.net";
     owner = "savoirfairelinux";
     repo = "jami-client-qt";
     rev = "stable/${version}";
-    hash = "sha256-uc2IcSAaCTkTMwjhgMRVdWsStLkOO5dPU2Hx+cYUUL0=";
+    hash = "sha256-+6DTbYq50UPSQ+KipXhWje1bZs64wZrS37z2Na1RtN8=";
     fetchSubmodules = true;
   };
 
@@ -123,14 +123,14 @@ stdenv.mkDerivation rec {
 
   dhtnet = stdenv.mkDerivation {
     pname = "dhtnet";
-    version = "unstable-2025-03-19";
+    version = "unstable-2025-05-26";
 
     src = fetchFromGitLab {
       domain = "git.jami.net";
       owner = "savoirfairelinux";
       repo = "dhtnet";
-      rev = "7e7359ff5dadd9aaf6d341486f3ee41029f645e1";
-      hash = "sha256-sT7OgYUBnO+HfIeCaR3lmoFJ9qE1Y5TEK1/KHzhvK7M=";
+      rev = "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2";
+      hash = "sha256-uweYSEysVMUC7DhI9BhS1TDZ6ZY7WQ9JS3ZF9lKA4Fo=";
     };
 
     postPatch = ''
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index bf1c439bbc3b..a00eb83a2a5e 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -190,7 +190,7 @@ stdenv.mkDerivation (finalAttrs: {
       PLUG=$vim/share/vim-plugins/notmuch/plugin/notmuch.vim
       cat >> $PLUG << EOF
         let \$GEM_PATH=\$GEM_PATH . ":${finalAttrs.passthru.gemEnv}/${ruby.gemPath}"
-        let \$RUBYLIB=\$RUBYLIB . ":$vim/${ruby.libPath}/${ruby.system}"
+        let \$RUBYLIB=\$RUBYLIB . ":$out/${ruby.libPath}/${ruby.system}"
         if has('nvim')
       EOF
       for gem in ${finalAttrs.passthru.gemEnv}/${ruby.gemPath}/gems/*/lib; do
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index d50245b45021..bc9987dbf375 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-xPj50l06APgHCVg7h6qDEtAUVAkLc6QTtD7H7HwHujk=";
+    hash = "sha256-Lk5KkH2UJ/DD3U1nlczq9yzPOX6dyWH2DtvvMAb2r0c=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e4903a823013..53b1944dcb56 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -101,6 +101,7 @@
   libetonyek,
   liborcus,
   libpng,
+  libxcrypt,
   langs ? [
     "ar"
     "ca"
@@ -378,16 +379,34 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig
   '';
 
-  nativeBuildInputs = [
-    autoconf
-    automake
-    bison
-    fontforge
-    gdb
-    jdk21
-    libtool
-    pkg-config
-  ];
+  nativeBuildInputs =
+    [
+      ant
+      autoconf
+      automake
+      bison
+      flex
+      fontforge
+      gdb
+      gettext
+      gperf
+      icu
+      jdk21
+      libmysqlclient
+      libtool
+      libxml2
+      libxslt
+      perl
+      perlPackages.ArchiveZip
+      perlPackages.IOCompress
+      pkg-config
+      python311
+      unzip
+      zip
+    ]
+    ++ optionals kdeIntegration [
+      qtbase
+    ];
 
   buildInputs =
     finalAttrs.passthru.gst_packages
@@ -397,11 +416,8 @@ stdenv.mkDerivation (finalAttrs: {
       # propagated libpng
       # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html
       (libpng.override { apngSupport = false; })
-      perlPackages.ArchiveZip
       coinmp
-      perlPackages.IOCompress
       abseil-cpp
-      ant
       bluez5
       boost
       box2d_2
@@ -414,15 +430,12 @@ stdenv.mkDerivation (finalAttrs: {
       dbus-glib
       expat
       file
-      flex
       fontconfig
       freetype
       getopt
-      gettext
       glib
       glm
       adwaita-icon-theme
-      gperf
       gpgme
       graphite2
       gtk3
@@ -433,6 +446,7 @@ stdenv.mkDerivation (finalAttrs: {
       lcms2
       libGL
       libGLU
+      libtool
       xorg.libX11
       xorg.libXaw
       xorg.libXdmcp
@@ -454,7 +468,6 @@ stdenv.mkDerivation (finalAttrs: {
       liblangtag
       libmspack
       libmwaw
-      libmysqlclient
       libodfgen
       liborcus
       xorg.libpthreadstubs
@@ -466,6 +479,7 @@ stdenv.mkDerivation (finalAttrs: {
       libwpd
       libwpg
       libwps
+      libxcrypt
       libxml2
       xorg.libxshmfence
       libxslt
@@ -481,17 +495,14 @@ stdenv.mkDerivation (finalAttrs: {
       openldap
       openssl
       pam
-      perl
       poppler
       libpq
       python311
       sane-backends
       unixODBC
-      unzip
       util-linux
       which
       xmlsec
-      zip
       zlib
     ]
     ++ optionals kdeIntegration [
@@ -691,6 +702,8 @@ stdenv.mkDerivation (finalAttrs: {
   # Wrapping is done in ./wrapper.nix
   dontWrapQtApps = true;
 
+  strictDeps = true;
+
   passthru = {
     inherit srcs;
     jdk = jre';
diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index 871b0921ee47..d03faf8c63c7 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -20,10 +20,9 @@
   libXScrnSaver,
   libusb1,
   pkg-config,
-  fetchpatch,
 # #FIXME: Could not get cmake to pick up on these dependencies
-# Prevents cmake from building the OCR video capabilities
-# Everything else should work just missing this on plugin
+# Ommiting them prevents cmake from building the OCR video capabilities
+# Everything else should work it's just missing this one plugin
 # tesseract,
 # leptonica,
 }:
@@ -37,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.28.1";
+  version = "1.30.1";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-1U5quhfdhEBcCbEzW0uEpimYgvdbsIwaL2EdQ4cLF/M=";
+    hash = "sha256-UTgOZK4SFjTcbAGQGY4kQbaskWhKA5fAkHBPNlPYzxo=";
   };
 
   nativeBuildInputs = [
@@ -52,14 +51,6 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  patches = [
-    # https://github.com/WarmUpTill/SceneSwitcher/pull/1244
-    (fetchpatch {
-      url = "https://github.com/WarmUpTill/SceneSwitcher/commit/e0c650574f9f7f6cae5626afa9abf8a838dc0858.diff";
-      hash = "sha256-eXO8LdGYf60sd/kyxWVDSEpwyzp4Uu9TpPADg5ED4yU=";
-    })
-  ];
-
   buildInputs = [
     alsa-lib
     asio
diff --git a/pkgs/build-support/deno/build-deno-package/default.nix b/pkgs/build-support/deno/build-deno-package/default.nix
deleted file mode 100644
index 4059843ac421..000000000000
--- a/pkgs/build-support/deno/build-deno-package/default.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-# NOTE: much of this structure is inspired from https://github.com/NixOS/nixpkgs/tree/fff29a3e5f7991512e790617d1a693df5f3550f6/pkgs/build-support/node
-{
-  stdenvNoCC,
-  deno,
-  denort,
-  diffutils,
-  zip,
-  jq,
-  fetchDenoDeps,
-  buildPackages,
-  lib,
-}:
-{
-  name ? "${args.pname}-${args.version}",
-  src ? null,
-  # The output hash of the dependencies for this project.
-  denoDepsHash ? lib.fakeHash,
-  # The host platform, the output binary is compiled for.
-  hostPlatform ? stdenvNoCC.hostPlatform.system,
-  # A list of strings, which are names of impure env vars passed to the deps build.
-  # Example:
-  # `[ "NPM_TOKEN" ]`
-  # They will be forwarded to `deno install`.
-  # It can be used to set tokens for private NPM registries (in an `.npmrc` file).
-  # In multi user installations of Nix, you need to set the env vars in the daemon (probably with systemd).
-  # In nixos: `systemd.services.nix-daemon.environment.NPM_TOKEN = "<token>";`
-  denoDepsImpureEnvVars ? [ ],
-  # An attr set with env vars as key value pairs.
-  # Example:
-  # `{ "NPM_TOKEN" = "<token>"; }`
-  # They will be forwarded to `deno install`.
-  # It can be used to set tokens for private NPM registries (in an `.npmrc` file).
-  # You could pass these tokens from the cli with `--arg` (this can make your builds painful).
-  denoDepsInjectedEnvVars ? { },
-  # TODO: source overrides like in buildNpmPackage, i.e. injecting nix packages into the denoDeps
-  # this is more involved, since they can't directly be injected into the fixed output derivation
-  # of fetchDenoDeps. Instead we need to patch the lock file and remove the packages we intend to
-  # inject, then we need to build the rest of the packages like before and in a
-  # second step create normal derivation with the injected packages.
-  # then the two need to be merged into a single denoDeps derivation and finally the lock file needs
-  # to be reverted back to it's original form.
-  # It is possible to manipulate the registry.json files of the injected packages so that deno accepts them as is.
-  denoDeps ? fetchDenoDeps {
-    inherit
-      src
-      denoDepsInjectedEnvVars
-      denoDepsImpureEnvVars
-      denoFlags
-      denoDir
-      ;
-    denoInstallFlags = builtins.filter (e: e != "--cached-only") denoInstallFlags;
-    name = "${name}-deno-deps";
-    hash = denoDepsHash;
-  },
-  # The package used for every deno command in the build
-  denoPackage ? deno,
-  # The package used as the runtime that is bundled with the the src to create the binary.
-  denortPackage ? denort,
-  # The script to run to build the project.
-  # You still need to specify in the installPhase, what artifacts to copy to `$out`.
-  denoTaskScript ? "build",
-  # If not null, create a binary using the specified path as the entrypoint,
-  # copy it to `$out/bin` in installPhase and fix it in fixupPhase.
-  binaryEntrypointPath ? null,
-  # Flags to pass to all deno commands.
-  denoFlags ? [ ],
-  # Flags to pass to `deno task [denoTaskFlags] ${denoTaskScript}`.
-  denoTaskFlags ? [ ],
-  # Flags to pass to `deno compile [denoTaskFlags] ${binaryEntrypointPath}`.
-  denoCompileFlags ? [ ],
-  # Flags to pass to `deno install [denoInstallFlags]`.
-  denoInstallFlags ? [
-    "--allow-scripts"
-    "--frozen"
-    "--cached-only"
-  ],
-  # Flags to pass to `deno task [denoTaskFlags] ${denoTaskScript} [extraTaskFlags]`.
-  extraTaskFlags ? [ ],
-  # Flags to pass to `deno compile [denoTaskFlags] ${binaryEntrypointPath} [extraCompileFlags]`.
-  extraCompileFlags ? [ ],
-  nativeBuildInputs ? [ ],
-  dontFixup ? true,
-  # Custom denoConfigHook
-  denoConfigHook ? null,
-  # Custom denoBuildHook
-  denoBuildHook ? null,
-  # Custom denoInstallHook
-  denoInstallHook ? null,
-  # Path to deno workspace, where the denoTaskScript should be run
-  denoWorkspacePath ? null,
-  # Unquoted string injected before `deno task`
-  denoTaskPrefix ? "",
-  # Unquoted string injected after `deno task` and all its flags
-  denoTaskSuffix ? "",
-  # Used as the name of the local DENO_DIR
-  denoDir ? "./.deno",
-  ...
-}@args:
-let
-  denoFlags_ = builtins.concatStringsSep " " denoFlags;
-  denoTaskFlags_ = builtins.concatStringsSep " " denoTaskFlags;
-  denoCompileFlags_ = builtins.concatStringsSep " " denoCompileFlags;
-  denoInstallFlags_ = builtins.concatStringsSep " " denoInstallFlags;
-  extraTaskFlags_ = builtins.concatStringsSep " " extraTaskFlags;
-  extraCompileFlags_ = builtins.concatStringsSep " " extraCompileFlags;
-
-  args' = builtins.removeAttrs args [ "denoDepsInjectedEnvVars" ];
-
-  denoHooks =
-    (buildPackages.denoHooks.override {
-      denort = denortPackage;
-    })
-      {
-        inherit denoTaskSuffix denoTaskPrefix binaryEntrypointPath;
-      };
-  systemLookupTable = {
-    "x86_64-darwin" = "x86_64-apple-darwin";
-    "arm64-darwin" = "aarch64-apple-darwin";
-    "aarch64-darwin" = "aarch64-apple-darwin";
-    "x86_64-linux" = "x86_64-unknown-linux-gnu";
-    "arm64-linux" = "aarch64-unknown-linux-gnu";
-    "aarch64-linux" = "aarch64-unknown-linux-gnu";
-  };
-  hostPlatform_ =
-    if builtins.hasAttr hostPlatform systemLookupTable then
-      systemLookupTable."${hostPlatform}"
-    else
-      (lib.systems.elaborate hostPlatform).config;
-in
-stdenvNoCC.mkDerivation (
-  args'
-  // {
-    inherit
-      name
-      denoDeps
-      src
-      denoFlags_
-      denoTaskFlags_
-      denoCompileFlags_
-      denoInstallFlags_
-      extraTaskFlags_
-      extraCompileFlags_
-      binaryEntrypointPath
-      hostPlatform_
-      denoWorkspacePath
-      denoTaskScript
-      ;
-
-    nativeBuildInputs = nativeBuildInputs ++ [
-      # Prefer passed hooks
-      (if denoConfigHook != null then denoConfigHook else denoHooks.denoConfigHook)
-      (if denoBuildHook != null then denoBuildHook else denoHooks.denoBuildHook)
-      (if denoInstallHook != null then denoInstallHook else denoHooks.denoInstallHook)
-      denoPackage
-      diffutils
-      zip
-      jq
-    ];
-
-    DENO_DIR = denoDir;
-
-    dontFixup = if binaryEntrypointPath != null then false else dontFixup;
-
-    passthru = {
-      inherit denoDeps;
-    };
-
-    meta = (args.meta or { }) // {
-      platforms = args.meta.platforms or denoPackage.meta.platforms;
-    };
-  }
-)
diff --git a/pkgs/build-support/deno/build-deno-package/hooks/default.nix b/pkgs/build-support/deno/build-deno-package/hooks/default.nix
deleted file mode 100644
index 7ece1943a3cf..000000000000
--- a/pkgs/build-support/deno/build-deno-package/hooks/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  makeSetupHook,
-  denort,
-  lib,
-}:
-{
-  denoTaskSuffix,
-  denoTaskPrefix,
-  binaryEntrypointPath,
-}:
-{
-  denoConfigHook = makeSetupHook {
-    name = "deno-config-hook";
-    substitutions = {
-      denortBinary = lib.optionalString (binaryEntrypointPath != null) (lib.getExe denort);
-    };
-  } ./deno-config-hook.sh;
-
-  denoBuildHook = makeSetupHook {
-    name = "deno-build-hook";
-    substitutions = {
-      inherit denoTaskSuffix denoTaskPrefix;
-    };
-  } ./deno-build-hook.sh;
-
-  denoInstallHook = makeSetupHook {
-    name = "deno-install-hook";
-  } ./deno-install-hook.sh;
-}
diff --git a/pkgs/build-support/deno/build-deno-package/hooks/deno-build-hook.sh b/pkgs/build-support/deno/build-deno-package/hooks/deno-build-hook.sh
deleted file mode 100644
index 66ffb51d3efa..000000000000
--- a/pkgs/build-support/deno/build-deno-package/hooks/deno-build-hook.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-# shellcheck shell=bash
-
-denoBuildHook() {
-  echo "Executing denoBuildHook"
-
-  runHook preBuild
-
-  if [ -n "${binaryEntrypointPath-}" ]; then
-    echo "Creating binary"
-
-    package_name=$(jq -r '.name' deno.json)
-    if [ "$package_name" == "null" ]; then
-      package_name="$name"
-    fi
-
-    deno compile \
-      --output "$package_name" \
-      --target "$hostPlatform_" \
-      $denoCompileFlags \
-      $denoFlags \
-      "${denoWorkspacePath+$denoWorkspacePath/}$binaryEntrypointPath"
-      $extraCompileFlags \
-
-  elif [ -n "${denoTaskScript-}" ]; then
-    if ! @denoTaskPrefix@ \
-      deno task \
-      ${denoWorkspacePath+--cwd=$denoWorkspacePath} \
-      $denoTaskFlags \
-      $denoFlags \
-      "$denoTaskScript" \
-      $extraTaskFlags \
-      @denoTaskSuffix@; then
-      echo
-      echo 'ERROR: `deno task` failed'
-      echo
-      echo "Here are a few things you can try, depending on the error:"
-      echo "1. Make sure your task script ($denoTaskScript) exists"
-      echo
-
-      exit 1
-    fi
-  else
-    echo
-    echo "ERROR: nothing to do in buildPhase"
-    echo "Specify either 'binaryEntrypointPath' or 'denoTaskScript' or override 'buildPhase'"
-    echo
-
-    exit 1
-  fi
-
-  runHook postBuild
-
-  echo "Finished denoBuildHook"
-}
-
-if [ -z "${buildPhase-}" ]; then
-  buildPhase=denoBuildHook
-fi
diff --git a/pkgs/build-support/deno/build-deno-package/hooks/deno-config-hook.sh b/pkgs/build-support/deno/build-deno-package/hooks/deno-config-hook.sh
deleted file mode 100644
index 28b6304c6ca4..000000000000
--- a/pkgs/build-support/deno/build-deno-package/hooks/deno-config-hook.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-# shellcheck shell=bash
-
-denoConfigHook() {
-  echo "Executing denoConfigHook"
-
-  if [ -z "${denoDeps-}" ]; then
-    echo
-    echo "ERROR: no dependencies were specified"
-    echo 'Hint: set `denoDeps` if using these hooks individually. If this is happening with `buildDenoPackage`, please open an issue.'
-    echo
-
-    exit 1
-  fi
-
-  local -r cacheLockfile="$denoDeps/deno.lock"
-  local -r srcLockfile="$PWD/deno.lock"
-
-  echo "Validating consistency between $srcLockfile and $cacheLockfile"
-
-  if ! diff "$srcLockfile" "$cacheLockfile"; then
-    # If the diff failed, first double-check that the file exists, so we can
-    # give a friendlier error msg.
-    if ! [ -e "$srcLockfile" ]; then
-      echo
-      echo "ERROR: Missing deno.lock from src. Expected to find it at: $srcLockfile"
-      echo
-
-      exit 1
-    fi
-
-    if ! [ -e "$cacheLockfile" ]; then
-      echo
-      echo "ERROR: Missing lockfile from cache. Expected to find it at: $cacheLockfile"
-      echo
-
-      exit 1
-    fi
-
-    echo
-    echo "ERROR: denoDepsHash is out of date"
-    echo
-    echo "The deno.lock in src is not the same as the in $denoDeps."
-    echo
-    echo "To fix the issue:"
-    echo '1. Use `lib.fakeHash` as the denoDepsHash value'
-    echo "2. Build the derivation and wait for it to fail with a hash mismatch"
-    echo "3. Copy the 'got: sha256-' value back into the denoDepsHash field"
-    echo
-
-    exit 1
-  fi
-
-  # NOTE: we need to use vendor in the build too, since we used it for the deps
-  useVendor() {
-    jq '.vendor = true' deno.json >temp.json &&
-      rm -f deno.json &&
-      mv temp.json deno.json
-  }
-  echo "Adding vendor to deno.json"
-  useVendor
-
-  echo "Installing dependencies"
-
-  export DENO_DIR="$(pwd)"/"$DENO_DIR"
-
-  installDeps() {
-    if [[ -d "$denoDeps/.deno" ]]; then
-      cp -r --no-preserve=mode "$denoDeps/.deno" "$DENO_DIR"
-    fi
-    if [[ -d "$denoDeps/vendor" ]]; then
-      cp -r --no-preserve=mode "$denoDeps/vendor" ./vendor
-    fi
-    if [[ -d "$denoDeps/node_modules" ]]; then
-      cp -r --no-preserve=mode "$denoDeps/node_modules" ./node_modules
-    fi
-  }
-  installDeps
-
-  if ! deno install $denoInstallFlags_ $denoFlags_; then
-    echo
-    echo "ERROR: deno failed to install dependencies"
-    echo
-
-    exit 1
-  fi
-
-  installDenort() {
-    version="$(deno --version | head -1 | awk '{print $2}')"
-    zipfile=denort-"$hostPlatform_".zip
-    dir="$DENO_DIR"/dl/release/v"$version"
-    mkdir -p "$dir"
-    cp "@denortBinary@" ./denort
-    zip "$dir"/"$zipfile" ./denort
-    rm ./denort
-  }
-  if [ -n "${binaryEntrypointPath-}" ]; then
-    echo "Installing denort for binary build"
-    installDenort
-  fi
-
-  patchShebangs .deno
-  patchShebangs node_modules
-  patchShebangs vendor
-
-  echo "Finished denoConfigHook"
-}
-
-postPatchHooks+=(denoConfigHook)
diff --git a/pkgs/build-support/deno/build-deno-package/hooks/deno-install-hook.sh b/pkgs/build-support/deno/build-deno-package/hooks/deno-install-hook.sh
deleted file mode 100644
index 969c59da5809..000000000000
--- a/pkgs/build-support/deno/build-deno-package/hooks/deno-install-hook.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-# shellcheck shell=bash
-
-denoInstallHook() {
-  echo "Executing denoInstallHook"
-
-  runHook preInstall
-
-  if [ -n "${binaryEntrypointPath-}" ]; then
-    package_name=$(jq -r '.name' deno.json)
-    if [ "$package_name" == "null" ]; then
-      package_name="$name"
-    fi
-
-    mkdir -p "$out/bin"
-    cp "$package_name"* "$out/bin"
-  else
-    echo
-    echo "ERROR: nothing to do in installPhase"
-    echo "Specify either 'binaryEntrypointPath' or override 'installPhase'"
-    echo
-
-    exit 1
-  fi
-
-  runHook postInstall
-
-  echo "Finished denoInstallHook"
-}
-
-if [ -z "${dontDenoInstall-}" ] && [ -z "${installPhase-}" ]; then
-  installPhase=denoInstallHook
-fi
diff --git a/pkgs/build-support/deno/fetch-deno-deps/.gitignore b/pkgs/build-support/deno/fetch-deno-deps/.gitignore
deleted file mode 100644
index 95aecda46ec1..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.deno/
-vendor/
-node_modules/
-.direnv
diff --git a/pkgs/build-support/deno/fetch-deno-deps/default.nix b/pkgs/build-support/deno/fetch-deno-deps/default.nix
deleted file mode 100644
index a676deeb6d92..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/default.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-# NOTE: much of this structure is inspired from https://github.com/NixOS/nixpkgs/tree/fff29a3e5f7991512e790617d1a693df5f3550f6/pkgs/build-support/node
-{
-  lib,
-  stdenvNoCC,
-  deno,
-  jq,
-  cacert,
-}:
-{
-  fetchDenoDeps =
-    {
-      name ? "deno-deps",
-      src,
-      hash ? lib.fakeHash,
-      denoPackage ? deno,
-      denoFlags ? [ ],
-      denoInstallFlags ? [
-        "--allow-scripts"
-        "--frozen"
-      ],
-      nativeBuildInputs ? [ ],
-      denoDepsImpureEnvVars ? [ ],
-      denoDepsInjectedEnvVars ? { },
-      denoDir ? "./.deno",
-      ...
-    }@args:
-    let
-      hash_ =
-        if hash != "" then
-          { outputHash = hash; }
-        else
-          {
-            outputHash = "";
-            outputHashAlgo = "sha256";
-          };
-      denoInstallFlags_ = builtins.concatStringsSep " " denoInstallFlags;
-      denoFlags_ = builtins.concatStringsSep " " denoFlags;
-      denoDepsInjectedEnvVarsString =
-        if denoDepsInjectedEnvVars != { } then
-          lib.attrsets.foldlAttrs (
-            acc: name: value:
-            "${acc} ${name}=${value}"
-          ) "" denoDepsInjectedEnvVars
-        else
-          "";
-      # need to remove denoDepsInjectedEnvVars, since it's an attrset and
-      # stdenv.mkDerivation would try to convert it to string
-      args' = builtins.removeAttrs args [ "denoDepsInjectedEnvVars" ];
-    in
-    stdenvNoCC.mkDerivation (
-      args'
-      // {
-        inherit name src;
-
-        nativeBuildInputs = nativeBuildInputs ++ [
-          denoPackage
-          jq
-        ];
-
-        DENO_DIR = denoDir;
-
-        buildPhase = ''
-          runHook preBuild
-
-          if [[ ! -e "deno.json" ]]; then
-            echo ""
-            echo "ERROR: deno.json required, but not found"
-            echo ""
-            exit 1
-          fi
-
-          if [[ ! -e "deno.lock" ]]; then
-            echo ""
-            echo "ERROR: deno.lock required, but not found"
-            echo ""
-            exit 1
-          fi
-
-          # NOTE: using vendor reduces the pruning effort a little
-          useVendor() {
-              jq '.vendor = true' deno.json >temp.json && \
-              rm -f deno.json && \
-              mv temp.json deno.json
-          }
-          useVendor
-
-          # uses $DENO_DIR
-          ${denoDepsInjectedEnvVarsString} deno install ${denoInstallFlags_} ${denoFlags_}
-
-          echo "pruning non reproducible files"
-
-          # `node_modules` is used when there are install scripts in a dependencies' package.json.
-          # these install scripts can also require internet, so they should also be executed in this fetcher
-          pruneNonReproducibles() {
-              export tempDenoDir="$DENO_DIR"
-
-              # `registry.json` files can't just be deleted, else deno install won't work,
-              # but they contain non reproducible data,
-              # which needs to be pruned, leaving only the necessary data behind.
-              # This pruning is done with a helper script written in typescript and executed with deno
-              DENO_DIR=./extra_deno_cache deno run \
-                --lock="${./deno.lock}" \
-                --config="${./deno.json}" \
-                --allow-all \
-                "${./prune-registries.ts}" \
-                --lock-json="./deno.lock" \
-                --cache-path="$tempDenoDir" \
-                --vendor-path="./vendor"
-
-              # Keys in `registry.json` files are not deterministically sorted,
-              # so we do it here.
-              for file in $(find -L "$DENO_DIR" -name registry.json -type f); do
-                  jq --sort-keys '.' "$file" >temp.json && \
-                  rm -f "$file" && \
-                  mv temp.json "$file"
-              done
-
-              # There are various small databases used by deno for caching that
-              # we can simply delete.
-              if [[ -d "./node_modules" ]]; then
-                find -L ./node_modules -name '*cache_v2-shm' -type f | xargs rm -f
-                find -L ./node_modules -name '*cache_v2-wal' -type f | xargs rm -f
-                find -L ./node_modules -name 'dep_analysis_cache_v2' -type f | xargs rm -f
-                find -L ./node_modules -name 'node_analysis_cache_v2' -type f | xargs rm -f
-                find -L ./node_modules -name v8_code_cache_v2 -type f | xargs rm -f
-                rm -f ./node_modules/.deno/.deno.lock.poll
-
-                # sometimes a .deno dir is slipped into a node_modules package
-                # it's unclear why. but it can just be deleted
-                find -L ./node_modules -name ".deno" -type d | sort -r | head -n-1 | xargs rm -rf
-              fi
-
-              rm -f "$DENO_DIR"/dep_analysis_cache_v2-shm
-              rm -f "$DENO_DIR"/dep_analysis_cache_v2-wal
-              rm -f "$DENO_DIR"/dep_analysis_cache_v2
-          }
-          pruneNonReproducibles
-
-          runHook postBuild
-        '';
-
-        installPhase = ''
-          runHook preInstall
-
-          if [[ -d "$DENO_DIR" ]]; then
-            mkdir -p $out/$DENO_DIR
-            cp -r --no-preserve=mode $DENO_DIR $out
-          fi
-          if [[ -d "./vendor" ]]; then
-            mkdir -p $out/vendor
-            cp -r --no-preserve=mode ./vendor $out
-          fi
-          if [[ -d "./node_modules" ]]; then
-            mkdir -p $out/node_modules
-            cp -r --no-preserve=mode ./node_modules $out
-          fi
-
-          cp ./deno.lock $out
-
-          runHook postInstall
-        '';
-
-        dontFixup = true;
-
-        outputHashMode = "recursive";
-
-        impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ denoDepsImpureEnvVars;
-
-        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";
-
-      }
-      // hash_
-    );
-}
diff --git a/pkgs/build-support/deno/fetch-deno-deps/deno.json b/pkgs/build-support/deno/fetch-deno-deps/deno.json
deleted file mode 100644
index b658546e4b31..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/deno.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "tasks": { "test": "deno test" },
-  "imports": {
-    "@std/assert": "jsr:@std/assert@1.0.13",
-    "@std/cli": "jsr:@std/cli@1.0.16",
-    "@std/fs": "jsr:@std/fs@1.0.16"
-  }
-}
diff --git a/pkgs/build-support/deno/fetch-deno-deps/deno.lock b/pkgs/build-support/deno/fetch-deno-deps/deno.lock
deleted file mode 100644
index 7791e3142212..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/deno.lock
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@std/assert@1.0.13": "1.0.13",
-    "jsr:@std/cli@1.0.16": "1.0.16",
-    "jsr:@std/fs@1.0.16": "1.0.16",
-    "jsr:@std/internal@^1.0.6": "1.0.7",
-    "jsr:@std/path@1.0.9": "1.0.9",
-    "jsr:@std/path@^1.0.8": "1.0.9",
-    "npm:@types/node@*": "22.15.15"
-  },
-  "jsr": {
-    "@std/assert@1.0.13": {
-      "integrity": "ae0d31e41919b12c656c742b22522c32fb26ed0cba32975cb0de2a273cb68b29",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/cli@1.0.16": {
-      "integrity": "02df293099c35b9e97d8ca05f57f54bd1ee08134f25d19a4756b3924695f4b00"
-    },
-    "@std/fs@1.0.16": {
-      "integrity": "81878f62b6eeda0bf546197fc3daa5327c132fee1273f6113f940784a468b036",
-      "dependencies": [
-        "jsr:@std/path@^1.0.8"
-      ]
-    },
-    "@std/internal@1.0.7": {
-      "integrity": "39eeb5265190a7bc5d5591c9ff019490bd1f2c3907c044a11b0d545796158a0f"
-    },
-    "@std/path@1.0.9": {
-      "integrity": "260a49f11edd3db93dd38350bf9cd1b4d1366afa98e81b86167b4e3dd750129e"
-    }
-  },
-  "npm": {
-    "@types/node@22.15.15": {
-      "integrity": "sha512-R5muMcZob3/Jjchn5LcO8jdKwSCbzqmPB6ruBxMcf9kbxtniZHP327s6C37iOfuw8mbKK3cAQa7sEl7afLrQ8A==",
-      "dependencies": [
-        "undici-types"
-      ]
-    },
-    "undici-types@6.21.0": {
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="
-    }
-  },
-  "workspace": {
-    "dependencies": [
-      "jsr:@std/assert@1.0.13",
-      "jsr:@std/cli@1.0.16",
-      "jsr:@std/fs@1.0.16"
-    ]
-  }
-}
diff --git a/pkgs/build-support/deno/fetch-deno-deps/prune-registries.test.ts b/pkgs/build-support/deno/fetch-deno-deps/prune-registries.test.ts
deleted file mode 100644
index 42f7edac640b..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/prune-registries.test.ts
+++ /dev/null
@@ -1,1054 +0,0 @@
-import { assertEquals } from "@std/assert";
-import type {
-  LockJson,
-  MetaJson,
-  PackageInfo,
-  PackagesByRegistry,
-  PackageSpecifiers,
-  RegistryJson,
-} from "./prune-registries.ts";
-import {
-  getAllPackageRegistries,
-  getAllPackagesByPackageRegistry,
-  getScopedName,
-  parsePackageSpecifier,
-  pruneMetaJson,
-  pruneRegistryJson,
-} from "./prune-registries.ts";
-
-type Fixture<T, R> = {
-  testValue: T;
-  expectedValue: R;
-};
-
-type Fixtures<T, R> = Array<Fixture<T, R>>;
-
-function testFactory<T, R>(
-  assertFunction: (actual: R, expected: R, msg?: string) => void,
-  testFunction: (args: T) => R,
-  fixtures: Fixtures<T, R>
-): () => void {
-  return () => {
-    fixtures.forEach((fixture) => {
-      assertFunction(testFunction(fixture.testValue), fixture.expectedValue);
-    });
-  };
-}
-
-Deno.test("parsePackageSpecifier", () => {
-  type Args = string;
-  type ReturnValue = PackageInfo;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: "jsr:@std/assert@1.0.13",
-      expectedValue: {
-        full: "jsr:@std/assert@1.0.13",
-        registry: "jsr",
-        scope: "@std",
-        name: "assert",
-        version: "1.0.13",
-        suffix: undefined,
-      },
-    },
-    {
-      testValue: "npm:ini@5.0.0",
-      expectedValue: {
-        full: "npm:ini@5.0.0",
-        registry: "npm",
-        scope: undefined,
-        name: "ini",
-        version: "5.0.0",
-        suffix: undefined,
-      },
-    },
-    {
-      testValue: "npm:@amazn/style-dictionary@4.2.4_prettier@3.5.3",
-      expectedValue: {
-        full: "npm:@amazn/style-dictionary@4.2.4_prettier@3.5.3",
-        registry: "npm",
-        scope: "@amazn",
-        name: "style-dictionary",
-        version: "4.2.4",
-        suffix: "_prettier@3.5.3",
-      },
-    },
-  ];
-  testFactory(assertEquals, parsePackageSpecifier, fixtures)();
-});
-
-Deno.test("getScopedName", () => {
-  type Args = { name: string; scope?: string };
-  type ReturnValue = string;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: { name: "assert", scope: undefined },
-      expectedValue: "assert",
-    },
-    {
-      testValue: { name: "assert", scope: "std" },
-      expectedValue: "@std/assert",
-    },
-    {
-      testValue: { name: "assert", scope: "@std" },
-      expectedValue: "@std/assert",
-    },
-  ];
-  testFactory(
-    assertEquals,
-    (args: Args) => getScopedName(args.name, args.scope),
-    fixtures
-  )();
-});
-
-Deno.test("getAllPackageRegistries", () => {
-  type Args = PackageSpecifiers;
-  type ReturnValue = Set<string>;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: {
-        "jsr:@std/assert@1.0.13": "1.0.13",
-        "jsr:@std/cli@1.0.16": "1.0.16",
-        "jsr:@std/fs@1.0.16": "1.0.16",
-        "jsr:@std/internal@^1.0.6": "1.0.7",
-        "jsr:@std/path@1.0.9": "1.0.9",
-        "jsr:@std/path@^1.0.8": "1.0.9",
-        "npm:ini@5.0.0": "5.0.0",
-      },
-      expectedValue: new Set(["jsr", "npm"]),
-    },
-  ];
-  testFactory(assertEquals, getAllPackageRegistries, fixtures)();
-});
-
-Deno.test("getAllPackagesByPackageRegistry", () => {
-  type Args = { lockJson: LockJson; registries: Set<string> };
-  type ReturnValue = PackagesByRegistry;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: {
-        lockJson: JSON.parse(`
-{
-  "version": "4",
-  "specifiers": {
-    "jsr:@std/assert@1.0.13": "1.0.13",
-    "jsr:@std/cli@1.0.16": "1.0.16",
-    "jsr:@std/fs@1.0.16": "1.0.16",
-    "jsr:@std/internal@^1.0.6": "1.0.7",
-    "jsr:@std/path@1.0.9": "1.0.9",
-    "jsr:@std/path@^1.0.8": "1.0.9",
-    "npm:ini@5.0.0": "5.0.0"
-  },
-  "jsr": {
-    "@std/assert@1.0.13": {
-      "integrity": "ae0d31e41919b12c656c742b22522c32fb26ed0cba32975cb0de2a273cb68b29",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/cli@1.0.16": {
-      "integrity": "02df293099c35b9e97d8ca05f57f54bd1ee08134f25d19a4756b3924695f4b00"
-    },
-    "@std/fs@1.0.16": {
-      "integrity": "81878f62b6eeda0bf546197fc3daa5327c132fee1273f6113f940784a468b036",
-      "dependencies": [
-        "jsr:@std/path@^1.0.8"
-      ]
-    },
-    "@std/internal@1.0.7": {
-      "integrity": "39eeb5265190a7bc5d5591c9ff019490bd1f2c3907c044a11b0d545796158a0f"
-    },
-    "@std/path@1.0.9": {
-      "integrity": "260a49f11edd3db93dd38350bf9cd1b4d1366afa98e81b86167b4e3dd750129e"
-    }
-  },
-  "npm": {
-    "ini@5.0.0": {
-      "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw=="
-    }
-  },
-  "workspace": {
-    "dependencies": [
-      "jsr:@std/assert@1.0.13",
-      "jsr:@std/cli@1.0.16",
-      "jsr:@std/fs@1.0.16",
-      "jsr:@std/path@1.0.9",
-      "npm:ini@5.0.0"
-    ]
-  }
-}
-`),
-        registries: new Set(["npm", "jsr"]),
-      },
-      expectedValue: {
-        jsr: {
-          "@std/assert": {
-            "1.0.13": {
-              full: "@std/assert@1.0.13",
-              registry: undefined,
-              scope: "@std",
-              name: "assert",
-              version: "1.0.13",
-              suffix: undefined,
-            },
-          },
-          "@std/cli": {
-            "1.0.16": {
-              full: "@std/cli@1.0.16",
-              registry: undefined,
-              scope: "@std",
-              name: "cli",
-              version: "1.0.16",
-              suffix: undefined,
-            },
-          },
-          "@std/fs": {
-            "1.0.16": {
-              full: "@std/fs@1.0.16",
-              registry: undefined,
-              scope: "@std",
-              name: "fs",
-              version: "1.0.16",
-              suffix: undefined,
-            },
-          },
-          "@std/internal": {
-            "1.0.7": {
-              full: "@std/internal@1.0.7",
-              registry: undefined,
-              scope: "@std",
-              name: "internal",
-              version: "1.0.7",
-              suffix: undefined,
-            },
-          },
-          "@std/path": {
-            "1.0.9": {
-              full: "@std/path@1.0.9",
-              registry: undefined,
-              scope: "@std",
-              name: "path",
-              version: "1.0.9",
-              suffix: undefined,
-            },
-          },
-        },
-        npm: {
-          ini: {
-            "5.0.0": {
-              full: "ini@5.0.0",
-              registry: undefined,
-              scope: undefined,
-              name: "ini",
-              version: "5.0.0",
-              suffix: undefined,
-            },
-          },
-        },
-      },
-    },
-  ];
-  testFactory(
-    assertEquals,
-    (args: Args) =>
-      getAllPackagesByPackageRegistry(args.lockJson, args.registries),
-    fixtures
-  )();
-});
-
-Deno.test("pruneMetaJson", () => {
-  type Args = {
-    metaJson: MetaJson;
-    jsrPackages: PackagesByRegistry;
-    registry: string;
-  };
-  type ReturnValue = MetaJson;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: {
-        metaJson: {
-          scope: "std",
-          name: "cli",
-          latest: "1.0.17",
-          versions: {
-            "0.222.0": {},
-            "1.0.16": {},
-            "0.218.2": {},
-            "0.218.0": {},
-            "1.0.10": {},
-            "0.224.6": {},
-            "1.0.4": {},
-            "1.0.8": {},
-            "1.0.2": {},
-            "0.211.0": {},
-            "0.213.0": {},
-            "1.0.0-rc.2": {},
-            "1.0.3": {},
-            "1.0.0-rc.5": {},
-            "0.210.0": {},
-            "0.209.0": {},
-            "0.212.0": {},
-            "0.208.0": {},
-            "1.0.7": {},
-            "1.0.0": {},
-            "0.220.1": {},
-            "0.224.2": {},
-            "1.0.17": {},
-            "1.0.1": {},
-            "0.221.0": {},
-            "0.224.5": {},
-            "0.216.0": {},
-            "0.207.0": {},
-            "0.224.4": {},
-            "1.0.0-rc.4": {},
-            "0.214.0": {},
-            "0.223.0": {},
-            "1.0.6": {},
-            "0.224.1": {},
-            "0.224.0": {},
-            "1.0.15": {},
-            "1.0.0-rc.3": {},
-            "0.224.3": {},
-            "1.0.14": {},
-            "1.0.9": {},
-            "0.222.1": {},
-            "1.0.13": {},
-            "1.0.0-rc.1": {},
-            "0.219.0": {},
-            "1.0.5": {},
-            "1.0.11": {},
-            "0.224.7": {},
-            "0.215.0": {},
-            "1.0.12": {},
-            "0.217.0": {},
-            "0.213.1": {},
-            "0.219.1": {},
-            "0.218.1": {},
-          },
-        },
-        jsrPackages: {
-          jsr: {
-            "@luca/cases": {
-              "1.0.0": {
-                full: "@luca/cases@1.0.0",
-                registry: undefined,
-                scope: "@luca",
-                name: "cases",
-                version: "1.0.0",
-                suffix: undefined,
-              },
-            },
-            "@std/cli": {
-              "1.0.17": {
-                full: "@std/cli@1.0.17",
-                registry: undefined,
-                scope: "@std",
-                name: "cli",
-                version: "1.0.17",
-                suffix: undefined,
-              },
-            },
-          },
-        },
-        registry: "jsr",
-      },
-      expectedValue: {
-        scope: "std",
-        name: "cli",
-        latest: "",
-        versions: { "1.0.17": {} },
-      },
-    },
-    {
-      testValue: {
-        metaJson: {
-          scope: "luca",
-          name: "cases",
-          latest: "1.0.0",
-          versions: { "1.0.0": {} },
-        },
-        jsrPackages: {
-          jsr: {
-            "@luca/cases": {
-              "1.0.0": {
-                full: "@luca/cases@1.0.0",
-                registry: undefined,
-                scope: "@luca",
-                name: "cases",
-                version: "1.0.0",
-                suffix: undefined,
-              },
-            },
-            "@std/cli": {
-              "1.0.17": {
-                full: "@std/cli@1.0.17",
-                registry: undefined,
-                scope: "@std",
-                name: "cli",
-                version: "1.0.17",
-                suffix: undefined,
-              },
-            },
-          },
-        },
-        registry: "jsr",
-      },
-      expectedValue: {
-        scope: "luca",
-        name: "cases",
-        latest: "",
-        versions: { "1.0.0": {} },
-      },
-    },
-  ];
-  testFactory(
-    assertEquals,
-    (args: Args) =>
-      pruneMetaJson(args.metaJson, args.jsrPackages, args.registry),
-    fixtures
-  )();
-});
-
-Deno.test("pruneRegistryJson", () => {
-  type Args = {
-    registryJson: RegistryJson;
-    nonJsrPackages: PackagesByRegistry;
-    registry: string;
-  };
-  type ReturnValue = RegistryJson;
-  const fixtures: Array<Fixture<Args, ReturnValue>> = [
-    {
-      testValue: {
-        registryJson: {
-          name: "decamelize",
-          versions: {
-            "1.1.0": {
-              version: "1.1.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-1.1.0.tgz",
-                shasum: "fe90c002a0acec1435120ce83a6945641018d0c8",
-                integrity:
-                  "sha512-n7ZK2Y9+g6neJhxuH+BejddHBOZXp9vh5KcKbedUHVjl1SCU3nnO8iWTqNxLi7OCYabTpypddtlylvtecwrW1w==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "node test.js" },
-              deprecated: null,
-            },
-            "3.1.1": {
-              version: "3.1.1",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-3.1.1.tgz",
-                shasum: "ebf473c6f8607bd70fd9ed6d892da27c5eb8539e",
-                integrity:
-                  "sha512-pSJTQCBDZxv8siK5p/M42ZdhThhTtx3JU/OKli0yQSKebfM9q92op6zF7krYrWVKRtsE/RwTDiZLliMV3ECkXQ==",
-              },
-              bin: null,
-              dependencies: { xregexp: "^4.2.4" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "3.1.0": {
-              version: "3.1.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-3.1.0.tgz",
-                shasum: "81cd3f2e9911b8874e290d249da2c366453641d4",
-                integrity:
-                  "sha512-fgHaR077tSDdzV2ExQwtJ8Kx8LYOvnf1cm5JaQ1ESeGgO8CTH7wv3202zJEg1YND0Fx7WQDxeuDPdAPMERXBEg==",
-              },
-              bin: null,
-              dependencies: { xregexp: "^4.2.4" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "1.1.1": {
-              version: "1.1.1",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-1.1.1.tgz",
-                shasum: "8871479a6c0487f5653d48a992f1d0381ca6f031",
-                integrity:
-                  "sha512-l2nWbx7Uy2MCRQjEJQm6lep1GwWzl1DHr9wTcQzLQYOSes2RwALmR87OG91eNjoMbih7xrYhZX9cPWP3U7Kxmw==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "node test.js" },
-              deprecated: null,
-            },
-            "1.2.0": {
-              version: "1.2.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                shasum: "f6534d15148269b20352e7bee26f501f9a191290",
-                integrity:
-                  "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava" },
-              deprecated: null,
-            },
-            "2.0.0": {
-              version: "2.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-                shasum: "656d7bbc8094c4c788ea53c5840908c9c7d063c7",
-                integrity:
-                  "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-              },
-              bin: null,
-              dependencies: { xregexp: "4.0.0" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava" },
-              deprecated: null,
-            },
-            "3.0.0": {
-              version: "3.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-3.0.0.tgz",
-                shasum: "5efdacb0ff1b6e4031ccd0da71257340c1b846b7",
-                integrity:
-                  "sha512-NUW7GyGP5Al0a4QIr3qj/FVzPNjpixU/HWPMJ7kuFlMpVnLcNeUrKsvOOMlywL2QPr/JG3am40S5a2G9F0REcw==",
-              },
-              bin: null,
-              dependencies: { xregexp: "^4.2.4" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd-check" },
-              deprecated: null,
-            },
-            "5.0.0": {
-              version: "5.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-5.0.0.tgz",
-                shasum: "88358157b010ef133febfd27c18994bd80c6215b",
-                integrity:
-                  "sha512-U75DcT5hrio3KNtvdULAWnLiAPbFUC4191ldxMmj4FA/mRuBnmDwU0boNfPyFRhnan+Jm+haLeSn3P0afcBn4w==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "1.1.2": {
-              version: "1.1.2",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz",
-                shasum: "dcc93727be209632e98b02718ef4cb79602322f2",
-                integrity:
-                  "sha512-TzUj+sMdUozL/R01HUZfQNgHBclsYvlLLDoXpoVT//50AAuGNYj1jayRptx0gBgBWaViSim8YHnx0NgLmdx2KQ==",
-              },
-              bin: null,
-              dependencies: { "escape-string-regexp": "^1.0.4" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava" },
-              deprecated: null,
-            },
-            "4.0.0": {
-              version: "4.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-                shasum: "aa472d7bf660eb15f3494efd531cab7f2a709837",
-                integrity:
-                  "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "5.0.1": {
-              version: "5.0.1",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
-                shasum: "db11a92e58c741ef339fb0a2868d8a06a9a7b1e9",
-                integrity:
-                  "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "1.0.0": {
-              version: "1.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz",
-                shasum: "5287122f71691d4505b18ff2258dc400a5b23847",
-                integrity:
-                  "sha512-6OlbjTSfBWyqM8oFO7TYc6DgCIiT6vgCiZ973GDA98xVf+DOXVZvYLzRyi0HEJy5J31/69lel4AeY78OaasBLQ==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "node test.js" },
-              deprecated: null,
-            },
-            "3.2.0": {
-              version: "3.2.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-3.2.0.tgz",
-                shasum: "84b8e8f4f8c579f938e35e2cc7024907e0090851",
-                integrity:
-                  "sha512-4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw==",
-              },
-              bin: null,
-              dependencies: { xregexp: "^4.2.4" },
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-            "6.0.0": {
-              version: "6.0.0",
-              dist: {
-                tarball:
-                  "https://registry.npmjs.org/decamelize/-/decamelize-6.0.0.tgz",
-                shasum: "8cad4d916fde5c41a264a43d0ecc56fe3d31749e",
-                integrity:
-                  "sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA==",
-              },
-              bin: null,
-              dependencies: {},
-              optionalDependencies: {},
-              peerDependencies: {},
-              peerDependenciesMeta: {},
-              os: [],
-              cpu: [],
-              scripts: { test: "xo && ava && tsd" },
-              deprecated: null,
-            },
-          },
-          "dist-tags": { latest: "6.0.0" },
-        },
-        nonJsrPackages: {
-          npm: {
-            "ansi-regex": {
-              "3.0.1": {
-                full: "ansi-regex@3.0.1",
-                registry: undefined,
-                scope: undefined,
-                name: "ansi-regex",
-                version: "3.0.1",
-                suffix: undefined,
-              },
-              "5.0.1": {
-                full: "ansi-regex@5.0.1",
-                registry: undefined,
-                scope: undefined,
-                name: "ansi-regex",
-                version: "5.0.1",
-                suffix: undefined,
-              },
-            },
-            "ansi-styles": {
-              "4.3.0": {
-                full: "ansi-styles@4.3.0",
-                registry: undefined,
-                scope: undefined,
-                name: "ansi-styles",
-                version: "4.3.0",
-                suffix: undefined,
-              },
-            },
-            camelcase: {
-              "5.3.1": {
-                full: "camelcase@5.3.1",
-                registry: undefined,
-                scope: undefined,
-                name: "camelcase",
-                version: "5.3.1",
-                suffix: undefined,
-              },
-            },
-            cliui: {
-              "6.0.0": {
-                full: "cliui@6.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "cliui",
-                version: "6.0.0",
-                suffix: undefined,
-              },
-            },
-            "color-convert": {
-              "2.0.1": {
-                full: "color-convert@2.0.1",
-                registry: undefined,
-                scope: undefined,
-                name: "color-convert",
-                version: "2.0.1",
-                suffix: undefined,
-              },
-            },
-            "color-name": {
-              "1.1.4": {
-                full: "color-name@1.1.4",
-                registry: undefined,
-                scope: undefined,
-                name: "color-name",
-                version: "1.1.4",
-                suffix: undefined,
-              },
-            },
-            cowsay: {
-              "1.6.0": {
-                full: "cowsay@1.6.0",
-                registry: undefined,
-                scope: undefined,
-                name: "cowsay",
-                version: "1.6.0",
-                suffix: undefined,
-              },
-            },
-            decamelize: {
-              "1.2.0": {
-                full: "decamelize@1.2.0",
-                registry: undefined,
-                scope: undefined,
-                name: "decamelize",
-                version: "1.2.0",
-                suffix: undefined,
-              },
-            },
-            "emoji-regex": {
-              "8.0.0": {
-                full: "emoji-regex@8.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "emoji-regex",
-                version: "8.0.0",
-                suffix: undefined,
-              },
-            },
-            "find-up": {
-              "4.1.0": {
-                full: "find-up@4.1.0",
-                registry: undefined,
-                scope: undefined,
-                name: "find-up",
-                version: "4.1.0",
-                suffix: undefined,
-              },
-            },
-            "get-caller-file": {
-              "2.0.5": {
-                full: "get-caller-file@2.0.5",
-                registry: undefined,
-                scope: undefined,
-                name: "get-caller-file",
-                version: "2.0.5",
-                suffix: undefined,
-              },
-            },
-            "get-stdin": {
-              "8.0.0": {
-                full: "get-stdin@8.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "get-stdin",
-                version: "8.0.0",
-                suffix: undefined,
-              },
-            },
-            "is-fullwidth-code-point": {
-              "2.0.0": {
-                full: "is-fullwidth-code-point@2.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "is-fullwidth-code-point",
-                version: "2.0.0",
-                suffix: undefined,
-              },
-              "3.0.0": {
-                full: "is-fullwidth-code-point@3.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "is-fullwidth-code-point",
-                version: "3.0.0",
-                suffix: undefined,
-              },
-            },
-            "locate-path": {
-              "5.0.0": {
-                full: "locate-path@5.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "locate-path",
-                version: "5.0.0",
-                suffix: undefined,
-              },
-            },
-            "p-limit": {
-              "2.3.0": {
-                full: "p-limit@2.3.0",
-                registry: undefined,
-                scope: undefined,
-                name: "p-limit",
-                version: "2.3.0",
-                suffix: undefined,
-              },
-            },
-            "p-locate": {
-              "4.1.0": {
-                full: "p-locate@4.1.0",
-                registry: undefined,
-                scope: undefined,
-                name: "p-locate",
-                version: "4.1.0",
-                suffix: undefined,
-              },
-            },
-            "p-try": {
-              "2.2.0": {
-                full: "p-try@2.2.0",
-                registry: undefined,
-                scope: undefined,
-                name: "p-try",
-                version: "2.2.0",
-                suffix: undefined,
-              },
-            },
-            "path-exists": {
-              "4.0.0": {
-                full: "path-exists@4.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "path-exists",
-                version: "4.0.0",
-                suffix: undefined,
-              },
-            },
-            "require-directory": {
-              "2.1.1": {
-                full: "require-directory@2.1.1",
-                registry: undefined,
-                scope: undefined,
-                name: "require-directory",
-                version: "2.1.1",
-                suffix: undefined,
-              },
-            },
-            "require-main-filename": {
-              "2.0.0": {
-                full: "require-main-filename@2.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "require-main-filename",
-                version: "2.0.0",
-                suffix: undefined,
-              },
-            },
-            "set-blocking": {
-              "2.0.0": {
-                full: "set-blocking@2.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "set-blocking",
-                version: "2.0.0",
-                suffix: undefined,
-              },
-            },
-            "string-width": {
-              "2.1.1": {
-                full: "string-width@2.1.1",
-                registry: undefined,
-                scope: undefined,
-                name: "string-width",
-                version: "2.1.1",
-                suffix: undefined,
-              },
-              "4.2.3": {
-                full: "string-width@4.2.3",
-                registry: undefined,
-                scope: undefined,
-                name: "string-width",
-                version: "4.2.3",
-                suffix: undefined,
-              },
-            },
-            "strip-ansi": {
-              "4.0.0": {
-                full: "strip-ansi@4.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "strip-ansi",
-                version: "4.0.0",
-                suffix: undefined,
-              },
-              "6.0.1": {
-                full: "strip-ansi@6.0.1",
-                registry: undefined,
-                scope: undefined,
-                name: "strip-ansi",
-                version: "6.0.1",
-                suffix: undefined,
-              },
-            },
-            "strip-final-newline": {
-              "2.0.0": {
-                full: "strip-final-newline@2.0.0",
-                registry: undefined,
-                scope: undefined,
-                name: "strip-final-newline",
-                version: "2.0.0",
-                suffix: undefined,
-              },
-            },
-            "which-module": {
-              "2.0.1": {
-                full: "which-module@2.0.1",
-                registry: undefined,
-                scope: undefined,
-                name: "which-module",
-                version: "2.0.1",
-                suffix: undefined,
-              },
-            },
-            "wrap-ansi": {
-              "6.2.0": {
-                full: "wrap-ansi@6.2.0",
-                registry: undefined,
-                scope: undefined,
-                name: "wrap-ansi",
-                version: "6.2.0",
-                suffix: undefined,
-              },
-            },
-            y18n: {
-              "4.0.3": {
-                full: "y18n@4.0.3",
-                registry: undefined,
-                scope: undefined,
-                name: "y18n",
-                version: "4.0.3",
-                suffix: undefined,
-              },
-            },
-            "yargs-parser": {
-              "18.1.3": {
-                full: "yargs-parser@18.1.3",
-                registry: undefined,
-                scope: undefined,
-                name: "yargs-parser",
-                version: "18.1.3",
-                suffix: undefined,
-              },
-            },
-            yargs: {
-              "15.4.1": {
-                full: "yargs@15.4.1",
-                registry: undefined,
-                scope: undefined,
-                name: "yargs",
-                version: "15.4.1",
-                suffix: undefined,
-              },
-            },
-          },
-        },
-        registry: "npm",
-      },
-      expectedValue: {
-        name: "decamelize",
-        versions: {
-          "1.2.0": {
-            version: "1.2.0",
-            dist: {
-              tarball:
-                "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-              shasum: "f6534d15148269b20352e7bee26f501f9a191290",
-              integrity:
-                "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-            },
-            bin: null,
-            dependencies: {},
-            optionalDependencies: {},
-            peerDependencies: {},
-            peerDependenciesMeta: {},
-            os: [],
-            cpu: [],
-            scripts: { test: "xo && ava" },
-            deprecated: null,
-          },
-        },
-        "dist-tags": {},
-      },
-    },
-  ];
-  testFactory(
-    assertEquals,
-    (args: Args) =>
-      pruneRegistryJson(args.registryJson, args.nonJsrPackages, args.registry),
-    fixtures
-  )();
-});
diff --git a/pkgs/build-support/deno/fetch-deno-deps/prune-registries.ts b/pkgs/build-support/deno/fetch-deno-deps/prune-registries.ts
deleted file mode 100644
index 0a8b12d0a4a9..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/prune-registries.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/usr/bin/env deno
-import { parseArgs } from "@std/cli/parse-args";
-import { walkSync } from "@std/fs/walk";
-
-/**
- * NOTE: The problem this script solves, is that in every npm dependency in the deno cache
- * is a registry.json file, which serves as a sort of local registry cache for the deno cli.
- * Such a file looks like this (with deno v2.1.4):
- * ```json
- * {
- *   "name": "@floating-ui/core",
- *   "versions": {
- *     "0.7.0": { ... },
- *     "1.6.0": { ... },
- *     "0.1.2": { ... },
- *     ...
- *   },
- *   "dist-tags": { "latest": "1.7.0" }
- * }
- * ```
- * The deno cli will look into this file when called to look up if the required versions are there.
- * The problem is that the available versions for a package change over time. The registry.json files
- * need to be part of the fixed output derivation, which will eventually change the hash of the FOD,
- * if all those unwanted versions aren't pruned.
- *
- * On top of that a similar thing happens for jsr packages in the vendor directory
- * with `meta.json` files. These also need to be pruned.
- * Such a file looks like this (with deno v2.1.4):
- * ```json
- * {
- *   "scope": "std",
- *   "name": "internal",
- *   "latest": "1.0.6",
- *   "versions": {
- *     "0.202.0": {},
- *     "1.0.1": {},
- *     "0.225.0": {
- *       "yanked": true
- *     },
- * }
- * ```
- */
-
-export type PackageSpecifiers = {
-  [packageIdent: string]: string;
-};
-
-export type LockJson = {
-  specifiers: PackageSpecifiers;
-  version: string;
-  workspace: any;
-  [registry: string]: any;
-};
-
-export type Config = {
-  lockJson: LockJson;
-  cachePath: string;
-  vendorPath: string;
-};
-
-export type PackageInfo = {
-  full: string;
-  registry: string | undefined;
-  scope: string | undefined;
-  name: string;
-  version: string;
-  suffix: string | undefined;
-};
-
-export type PackagesByRegistry = {
-  [registry: string]: {
-    [packageName: string]: {
-      [version: string]: PackageInfo;
-    };
-  };
-};
-
-export type PathsByRegistry = {
-  [packageRegistry: string]: string[];
-};
-
-export type RegistryJson = {
-  "dist-tags": any;
-  "_deno.etag": string;
-  versions: { [version: string]: any };
-  name: string;
-};
-
-export type MetaJson = {
-  scope: string;
-  name: string;
-  latest: string;
-  versions: {
-    [version: string]: any;
-  };
-};
-
-export function getConfig(): Config {
-  const flags = parseArgs(Deno.args, {
-    string: ["lock-json", "cache-path", "vendor-path"],
-  });
-
-  if (!flags["lock-json"]) {
-    throw "--lock-json flag not set but required";
-  }
-  if (!flags["cache-path"]) {
-    throw "--cache-path flag not set but required";
-  }
-  if (!flags["vendor-path"]) {
-    throw "--vendor-path flag not set but required";
-  }
-
-  const lockJson = JSON.parse(
-    new TextDecoder("utf-8").decode(Deno.readFileSync(flags["lock-json"]))
-  );
-  if (!lockJson) {
-    throw `could not parse lockJson at ${flags["lock-json"]}`;
-  }
-
-  return {
-    lockJson,
-    cachePath: flags["cache-path"],
-    vendorPath: flags["vendor-path"],
-  };
-}
-
-export function getAllPackageRegistries(
-  specifiers: PackageSpecifiers
-): Set<string> {
-  return Object.keys(specifiers).reduce((acc: Set<string>, v: string) => {
-    const s = v.split(":");
-    if (s.length !== 2) {
-      throw "unexpected registry format";
-    }
-    const registry = s[0];
-    acc.add(registry);
-    return acc;
-  }, new Set());
-}
-
-export function parsePackageSpecifier(packageSpecifier: string): PackageInfo {
-  const match =
-    /^((?<registry>.*):)?((?<scope>@.*?)\/)?(?<name>.*?)@(?<version>.*?)(?<suffix>_.*)?$/.exec(
-      packageSpecifier
-    );
-  if (
-    match !== null &&
-    match.groups?.name !== undefined &&
-    match.groups?.version !== undefined
-  ) {
-    return {
-      // npm:@amazn/style-dictionary@4.2.4_prettier@3.5.3
-      full: match[0],
-      // npm
-      registry: match.groups?.registry,
-      // @amazn
-      scope: match.groups?.scope,
-      // style-dictionary
-      name: match.groups?.name,
-      // 4.2.4
-      version: match.groups?.version,
-      // _prettier@3.5.3
-      suffix: match.groups?.suffix,
-    };
-  }
-
-  throw "unexpected package specifier format";
-}
-
-export function getScopedName(name: string, scope?: string): string {
-  if (scope !== undefined) {
-    return `${scope[0] === "@" ? "" : "@"}${scope}/${name}`;
-  }
-  return name;
-}
-
-export function getAllPackagesByPackageRegistry(
-  lockJson: LockJson,
-  registries: Set<string>
-): PackagesByRegistry {
-  const result: PackagesByRegistry = {};
-  for (const registry of Array.from(registries)) {
-    const packageInfosOfRegistries = Object.keys(lockJson[registry]).map(
-      parsePackageSpecifier
-    );
-    result[registry] = {};
-    for (const packageInfo of packageInfosOfRegistries) {
-      const scopedName = getScopedName(packageInfo.name, packageInfo.scope);
-      if (result[registry][scopedName] === undefined) {
-        result[registry][scopedName] = {};
-      }
-      result[registry][scopedName][packageInfo.version] = packageInfo;
-    }
-  }
-  return result;
-}
-
-export function findRegistryJsonPaths(
-  cachePath: string,
-  nonJsrPackages: PackagesByRegistry
-): PathsByRegistry {
-  const result: PathsByRegistry = {};
-  for (const registry of Object.keys(nonJsrPackages)) {
-    const path = `${cachePath}/${registry}`;
-    const registryJsonPaths = Array.from(walkSync(path))
-      .filter((v) => v.name === "registry.json")
-      .map((v) => v.path);
-    result[registry] = registryJsonPaths;
-  }
-  return result;
-}
-
-export function pruneRegistryJson(
-  registryJson: RegistryJson,
-  nonJsrPackages: PackagesByRegistry,
-  registry: string
-) {
-  const scopedName = registryJson.name;
-  const packageInfoByVersion = nonJsrPackages[registry][scopedName];
-  if (!packageInfoByVersion) {
-    throw `could not find key "${scopedName}" in\n${Object.keys(
-      nonJsrPackages[registry]
-    )}`;
-  }
-
-  const newRegistryJson: RegistryJson = {
-    ...registryJson,
-    "_deno.etag": "",
-    "dist-tags": {},
-    versions: {},
-  };
-
-  for (const version of Object.keys(packageInfoByVersion)) {
-    newRegistryJson.versions[version] = registryJson.versions[version];
-  }
-
-  return newRegistryJson;
-}
-
-export function pruneRegistryJsonFiles(
-  nonJsrPackages: PackagesByRegistry,
-  registryJsonPathsByRegistry: PathsByRegistry
-): void {
-  for (const [registry, paths] of Object.entries(registryJsonPathsByRegistry)) {
-    for (const path of paths) {
-      const registryJson: RegistryJson = JSON.parse(
-        new TextDecoder("utf-8").decode(Deno.readFileSync(path))
-      );
-
-      const newRegistryJson = pruneRegistryJson(
-        registryJson,
-        nonJsrPackages,
-        registry
-      );
-
-      Deno.writeFileSync(
-        path,
-        new TextEncoder().encode(JSON.stringify(newRegistryJson))
-      );
-    }
-  }
-}
-
-export function findMetaJsonPaths(
-  vendorPath: string,
-  jsrPackages: PackagesByRegistry
-): PathsByRegistry {
-  const result: PathsByRegistry = {};
-  for (const registry of Object.keys(jsrPackages)) {
-    const path = `${vendorPath}`;
-    const metaJsonPaths = Array.from(walkSync(path))
-      .filter((v) => v.name === "meta.json")
-      .map((v) => v.path);
-    result[registry] = metaJsonPaths;
-  }
-  return result;
-}
-
-export function pruneMetaJson(
-  metaJson: MetaJson,
-  jsrPackages: PackagesByRegistry,
-  registry: string
-): MetaJson {
-  const scopedName = getScopedName(metaJson.name, metaJson.scope);
-  const packageInfoByVersion = jsrPackages[registry][scopedName];
-  if (!packageInfoByVersion) {
-    throw `could not find key "${scopedName}" in\n${Object.keys(
-      jsrPackages[registry]
-    )}`;
-  }
-  const newMetaJson: MetaJson = {
-    ...metaJson,
-    latest: "",
-    versions: {},
-  };
-
-  for (const version of Object.keys(packageInfoByVersion)) {
-    newMetaJson.versions[version] = metaJson.versions[version];
-  }
-  return newMetaJson;
-}
-
-export function pruneMetaJsonFiles(
-  jsrPackages: PackagesByRegistry,
-  metaJsonPathsByRegistry: PathsByRegistry
-): void {
-  for (const [registry, paths] of Object.entries(metaJsonPathsByRegistry)) {
-    for (const path of paths) {
-      const metaJson: MetaJson = JSON.parse(
-        new TextDecoder("utf-8").decode(Deno.readFileSync(path))
-      );
-
-      const newMetaJson = pruneMetaJson(metaJson, jsrPackages, registry);
-
-      Deno.writeFileSync(
-        path,
-        new TextEncoder().encode(JSON.stringify(newMetaJson))
-      );
-    }
-  }
-}
-
-function main() {
-  const config = getConfig();
-  const registries = getAllPackageRegistries(config.lockJson.specifiers);
-  const packages = getAllPackagesByPackageRegistry(config.lockJson, registries);
-
-  const jsrPackages = {
-    jsr: structuredClone(packages.jsr),
-  } satisfies PackagesByRegistry;
-  delete packages.jsr;
-  const nonJsrPackages = packages;
-
-  const metaJsonpaths = findMetaJsonPaths(config.vendorPath, jsrPackages);
-  pruneMetaJsonFiles(jsrPackages, metaJsonpaths);
-
-  const registryJsonPaths = findRegistryJsonPaths(
-    config.cachePath,
-    nonJsrPackages
-  );
-  pruneRegistryJsonFiles(nonJsrPackages, registryJsonPaths);
-}
-
-if (import.meta.main) {
-  main();
-}
diff --git a/pkgs/build-support/deno/fetch-deno-deps/shell.nix b/pkgs/build-support/deno/fetch-deno-deps/shell.nix
deleted file mode 100644
index c81e60e40d1e..000000000000
--- a/pkgs/build-support/deno/fetch-deno-deps/shell.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  pkgs = import ../../../../default.nix { };
-in
-pkgs.mkShell {
-  buildInputs = [ pkgs.deno ];
-  DENO_DIR = "./.deno";
-}
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index ab98daa585a4..809dc8e93555 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -1062,7 +1062,7 @@ rec {
         // (optionalAttrs (extraPassthru != { } || src ? passthru) {
           passthru = extraPassthru // src.passthru or { };
         })
-        # Forward any additional arguments to the derviation
+        # Forward any additional arguments to the derivation
         // (removeAttrs args [
           "src"
           "name"
diff --git a/pkgs/by-name/ab/abaddon/package.nix b/pkgs/by-name/ab/abaddon/package.nix
index 93edf9ca9363..e8ae2679bcc1 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.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "uowuo";
     repo = "abaddon";
     rev = "v${version}";
-    hash = "sha256-FPhHy+4BmaoGrHGsc5o79Au9JcH5C+iWTYQYwnTLaUY=";
+    hash = "sha256-48lR1rIWMwLaTv+nIdqmQ3mHOayrC1P5OQuUb+URYh0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix
index a4e4f648c797..634065802427 100644
--- a/pkgs/by-name/ad/adios2/package.nix
+++ b/pkgs/by-name/ad/adios2/package.nix
@@ -7,12 +7,12 @@
   ninja,
   gfortran,
   pkg-config,
-  python3,
   python3Packages,
   mpi,
+  catalyst,
   bzip2,
   c-blosc2,
-  hdf5-mpi,
+  hdf5,
   libfabric,
   libpng,
   libsodium,
@@ -25,9 +25,25 @@
   yaml-cpp,
   nlohmann_json,
   llvmPackages,
+  ctestCheckHook,
+  mpiCheckPhaseHook,
+  testers,
+  mpiSupport ? true,
   pythonSupport ? false,
   withExamples ? false,
 }:
+let
+  adios2Packages = {
+    hdf5 = hdf5.override {
+      inherit mpi mpiSupport;
+      cppSupport = !mpiSupport;
+    };
+    catalyst = catalyst.override {
+      inherit mpi mpiSupport pythonSupport;
+    };
+    mpi4py = python3Packages.mpi4py.override { inherit mpi; };
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   version = "2.10.2";
   pname = "adios2";
@@ -41,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch =
     ''
-      patchShebangs cmake/install/post/generate-adios2-config.sh.in
+      chmod +x cmake/install/post/adios2-config.pre.sh.in
+      patchShebangs cmake/install/post/{generate-adios2-config,adios2-config.pre}.sh.in
     ''
     # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast.
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -58,16 +75,17 @@ stdenv.mkDerivation (finalAttrs: {
       pkg-config
     ]
     ++ lib.optionals pythonSupport [
-      python3
+      python3Packages.python
       python3Packages.pybind11
+      python3Packages.pythonImportsCheckHook
     ];
 
   buildInputs =
     [
-      mpi
       bzip2
       c-blosc2
-      (hdf5-mpi.override { inherit mpi; })
+      adios2Packages.catalyst
+      adios2Packages.hdf5
       libfabric
       libpng
       libsodium
@@ -82,53 +100,118 @@ stdenv.mkDerivation (finalAttrs: {
       # Todo: add these optional dependencies in nixpkgs.
       # sz
       # mgard
-      # catalyst
     ]
     ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx
     # openmp required by zfp
     ++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
 
-  propagatedBuildInputs = lib.optionals pythonSupport [
-    (python3Packages.mpi4py.override { inherit mpi; })
-    python3Packages.numpy
-  ];
+  propagatedBuildInputs =
+    lib.optional mpiSupport mpi
+    ++ lib.optional pythonSupport python3Packages.numpy
+    ++ lib.optional (mpiSupport && pythonSupport) adios2Packages.mpi4py;
 
   cmakeFlags = [
+    # adios2 builtin modules
+    (lib.cmakeBool "ADIOS2_USE_DataMan" true)
+    (lib.cmakeBool "ADIOS2_USE_MHS" true)
+    (lib.cmakeBool "ADIOS2_USE_SST" mpiSupport)
+
+    # declare thirdparty dependencies explicitly
+    (lib.cmakeBool "ADIOS2_USE_EXTERNAL_DEPENDENCIES" true)
+    (lib.cmakeBool "ADIOS2_USE_Blosc2" true)
+    (lib.cmakeBool "ADIOS2_USE_BZip2" true)
+    (lib.cmakeBool "ADIOS2_USE_ZFP" true)
+    (lib.cmakeBool "ADIOS2_USE_SZ" false)
+    (lib.cmakeBool "ADIOS2_USE_LIBPRESSIO" false)
+    (lib.cmakeBool "ADIOS2_USE_MGARD" false)
+    (lib.cmakeBool "ADIOS2_USE_PNG" true)
+    (lib.cmakeBool "ADIOS2_USE_CUDA" false)
+    (lib.cmakeBool "ADIOS2_USE_Kokkos" false)
+    (lib.cmakeBool "ADIOS2_USE_MPI" mpiSupport)
+    (lib.cmakeBool "ADIOS2_USE_DAOS" false)
+    (lib.cmakeBool "ADIOS2_USE_DataSpaces" false)
+    (lib.cmakeBool "ADIOS2_USE_ZeroMQ" true)
     (lib.cmakeBool "ADIOS2_USE_HDF5" true)
     (lib.cmakeBool "ADIOS2_USE_HDF5_VOL" true)
-    (lib.cmakeBool "BUILD_TESTING" false)
+    (lib.cmakeBool "ADIOS2_USE_IME" false)
+    (lib.cmakeBool "ADIOS2_USE_Python" pythonSupport)
+    (lib.cmakeBool "ADIOS2_USE_Fortran" true)
+    (lib.cmakeBool "ADIOS2_USE_UCX" (lib.meta.availableOn stdenv.hostPlatform ucx))
+    (lib.cmakeBool "ADIOS2_USE_Sodium" true)
+    (lib.cmakeBool "ADIOS2_USE_Catalyst" true)
+    (lib.cmakeBool "ADIOS2_USE_Campaign" true)
+    (lib.cmakeBool "ADIOS2_USE_AWSSDK" false)
+
+    # use vendored gtest as nixpkgs#gtest does not include <iomanip> in <gtest/gtest.h>
+    (lib.cmakeBool "ADIOS2_USE_EXTERNAL_GTEST" false)
+    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
+    # higher MPIEXEC_MAX_NUMPROCS>8 might cause tests failure in
+    #   - Engine.BP.BPJoinedArray.MultiBlock.BP4.MPI
+    #   - Engine.BP.BPJoinedArray.MultiBlock.BP5.MPI
+    #   - Bindings.Fortran.BPWriteReadHeatMap6D.MPI
+    # due to insufficiently robust data generation and comparison for larger MPI sizes.
+    (lib.cmakeFeature "MPIEXEC_MAX_NUMPROCS" "4")
+
+    # Enable support for Little/Big Endian Interoperability
+    (lib.cmakeBool "ADIOS2_USE_Endian_Reverse" true)
+
     (lib.cmakeBool "ADIOS2_BUILD_EXAMPLES" withExamples)
-    (lib.cmakeBool "ADIOS2_USE_EXTERNAL_DEPENDENCIES" true)
     (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
     (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
     (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
-    (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3.sitePackages)
+    (lib.cmakeFeature "CMAKE_INSTALL_PYTHONDIR" python3Packages.python.sitePackages)
   ];
 
-  # equired for finding the generated adios2-config.cmake file
-  env.adios2_DIR = "${placeholder "out"}/lib/cmake/adios2";
+  # Tests are time-consuming and moved to passthru.tests.withCheck.
+  doCheck = false;
+  dontUseNinjaCheck = true;
 
-  # Ctest takes too much time, so we only perform some smoke Python tests.
-  doInstallCheck = pythonSupport;
+  preCheck = ''
+    export adios2_DIR=$PWD
+  '';
 
-  preCheck =
-    ''
-      export PYTHONPATH=$out/${python3.sitePackages}:$PYTHONPATH
-    ''
-    + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") ''
-      rm ../testing/adios2/python/TestBPWriteTypesHighLevelAPI.py
-    '';
+  enableParallelChecking = false;
 
   enabledTestPaths = [
     "../testing/adios2/python/Test*.py"
   ];
 
+  __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck && mpiSupport;
+
+  nativeCheckInputs = [
+    python3Packages.python
+    ctestCheckHook
+    mpiCheckPhaseHook
+  ];
+
+  # required for finding the generated adios2-config.cmake file
+  preInstall = ''
+    export adios2_DIR=$out/lib/cmake/adios2
+  '';
+
   pythonImportsCheck = [ "adios2" ];
 
-  nativeInstallCheckInputs = lib.optionals pythonSupport [
-    python3Packages.pythonImportsCheckHook
-    python3Packages.pytestCheckHook
-  ];
+  passthru.tests = {
+    withCheck = finalAttrs.finalPackage.overrideAttrs {
+      doCheck = true;
+
+      disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+        # TypeError: cannot pickle 'TextIOWrapper' instances
+        "Test.Engine.DataMan1xN.Serial"
+        "Test.Engine.DataManSingleValues"
+        # The test assumed to always contain n*64 byte-length records. Right now the length of index buffer is 71 bytes.
+        "Staging.1x1.Local2.BPS.BB.BP4_stream"
+        # Timeout
+        "Staging.3x5LockGeometry.FS.BB.FileStream"
+        "Engine.Staging.TestOnDemandMPI.ADIOS2OnDemandMPI.SST.MPI"
+      ];
+    };
+
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "adios2" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
 
   meta = {
     homepage = "https://adios2.readthedocs.io/en/latest/";
diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix
index b67687d75178..fb742524fadd 100644
--- a/pkgs/by-name/ai/airgeddon/package.nix
+++ b/pkgs/by-name/ai/airgeddon/package.nix
@@ -115,13 +115,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "airgeddon";
-  version = "11.41";
+  version = "11.50";
 
   src = fetchFromGitHub {
     owner = "v1s1t0r1sh3r3";
     repo = "airgeddon";
     tag = "v${version}";
-    hash = "sha256-+hJqaEjEy8woJKE+HKg3utNrZmGeAdd0YWi62HPLN/I=";
+    hash = "sha256-hy6q25hWGEFlih0IuwoqDRjbUk1/iShj6uY+mz6hlFU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/al/alglib/package.nix b/pkgs/by-name/al/alglib/package.nix
index 270e0195c306..f0044b3198db 100644
--- a/pkgs/by-name/al/alglib/package.nix
+++ b/pkgs/by-name/al/alglib/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alglib3";
-  version = "4.04.0";
+  version = "4.05.0";
 
   src = fetchurl {
     url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
-    sha256 = "sha256-nPHllbcr1Hi3RzyOqvkZtACLJT2Gutu8WlItFJpnIUQ=";
+    sha256 = "sha256-czgBhziKjAO17ZwXChsjOazIaNODRrGyswhc4j4/T9s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index 8ddb7c933f52..1c06988f2bca 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alioth";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "alioth";
     tag = "v${version}";
-    hash = "sha256-xFNX2cxmaw2H8D21qs6mnTMuSidmJ0xJ/b4pxdLTvow=";
+    hash = "sha256-7mQmyWOMEHg374mmYGJL8xhVWlYk1zKplpjc74wLoKw=";
   };
 
   # Checks use `debug_assert_eq!`
   checkType = "debug";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-x2Abw/RVKpPx0EWyF3w0kywtd23A+NSNaHRVZ4oB1jI=";
+  cargoHash = "sha256-rAq3Ghg7zpiycQ8hNzn4Jz7cUCfwQ4aqtWxoVCg8MrE=";
 
   separateDebugInfo = true;
 
diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index acd1a501669a..489687dcdc54 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.1749297687-g3e4f54"
+        "@sourcegraph/amp": "^0.0.1750147289-g2a47fe"
       }
     },
     "node_modules/@colors/colors": {
@@ -29,14 +29,14 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1749297687-g3e4f54",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1749297687-g3e4f54.tgz",
-      "integrity": "sha512-KfAu6Ju4aeTKW3dQ17GmaVXJ+96IqUMCC8KJlb1uzOBcNudGVnwYogjkEAMu4N3hg1PJH6XcrimqmFRqPZb1+Q==",
+      "version": "0.0.1750147289-g2a47fe",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1750147289-g2a47fe.tgz",
+      "integrity": "sha512-uoWvE5jE9cjmJDLx1DiyeA9VQ7ONReVelcly84VNwmcwIyI04OWyt7azoWK9OfFZU0hTBOyp21E632QsvtaiHw==",
       "dependencies": {
-        "@types/runes": "^0.4.3",
         "@vscode/ripgrep": "1.15.11",
         "commander": "^11.1.0",
         "fuse.js": "^7.0.0",
+        "open": "^10.1.2",
         "runes": "^0.4.3",
         "string-width": "^6.1.0",
         "winston": "^3.17.0",
@@ -49,12 +49,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@types/runes": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@types/runes/-/runes-0.4.3.tgz",
-      "integrity": "sha512-kncnfKlRj4FM0+9IRBlZ/06b1BNVDya3d5hN5kFfuzCNAgZFZuApz/XBqe0+d6Y5cV/f86UD8q2ehnaSVdtBrw==",
-      "license": "MIT"
-    },
     "node_modules/@types/triple-beam": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
@@ -109,6 +103,21 @@
         "node": "*"
       }
     },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "license": "MIT",
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/color": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
@@ -180,6 +189,46 @@
         }
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -253,6 +302,39 @@
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
       "license": "MIT"
     },
+    "node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -265,6 +347,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-wsl": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "license": "MIT",
+      "dependencies": {
+        "is-inside-container": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/kuler": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
@@ -303,6 +400,24 @@
         "fn.name": "1.x.x"
       }
     },
+    "node_modules/open": {
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.2.tgz",
+      "integrity": "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==",
+      "license": "MIT",
+      "dependencies": {
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -329,6 +444,18 @@
         "node": ">= 6"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
+      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/runes": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/runes/-/runes-0.4.3.tgz",
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 5a598ee44e19..367f3e8dc621 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.1749297687-g3e4f54";
+  version = "0.0.1750147289-g2a47fe";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-WreJsyqyW/Z+TUPnQC7sKIpSgdpIzXQTgkXBthKCMZ4=";
+    hash = "sha256-mP4YOa2J4K3mr7PpRn+Nn+AMcmMSSTNcB59QEdAFZeE=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-dAJePSRKnXrdW8hr72JNxunQAiUtxH53sDrtYYX6++0=";
+  npmDepsHash = "sha256-aF4oMWmq4+tuXAhwDgqTX3dfHNV1upyD0dqBEoJiru8=";
 
   propagatedBuildInputs = [
     ripgrep
diff --git a/pkgs/by-name/an/andyetitmoves/package.nix b/pkgs/by-name/an/andyetitmoves/package.nix
index 26f1705d2261..3a3e09e8048b 100644
--- a/pkgs/by-name/an/andyetitmoves/package.nix
+++ b/pkgs/by-name/an/andyetitmoves/package.nix
@@ -95,6 +95,5 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.andyetitmoves.net/";
     license = licenses.unfree;
-    maintainers = with maintainers; [ bluescreen303 ];
   };
 }
diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json
index 42ea6c7e1254..0296e225c0ae 100644
--- a/pkgs/by-name/an/anyk/version.json
+++ b/pkgs/by-name/an/anyk/version.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://web.archive.org/web/20250504163105/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
-  "sha256": "0a7bdyadk00ik5kkx65v6qx433fcd8n7aj42fmzcijp5raz63plv",
-  "version": "3.42.0"
+  "url": "https://web.archive.org/web/20250603123530/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
+  "sha256": "0f25ppjq98kcib6d5c0qrwx9pcakj6g2cgsxh9x7cl149c0fy8d5",
+  "version": "3.43.0"
 }
diff --git a/pkgs/by-name/ar/arq/package.nix b/pkgs/by-name/ar/arq/package.nix
new file mode 100644
index 000000000000..ebb4d426fb06
--- /dev/null
+++ b/pkgs/by-name/ar/arq/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  cpio,
+  xar,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "arq";
+  version = "7.35.1";
+
+  src = fetchurl {
+    url = "https://www.arqbackup.com/download/arqbackup/Arq${finalAttrs.version}.pkg";
+    hash = "sha256-xkrWH2r3DaxsBBdyu0Wj/qzjJaa9DTZCzEaB/nb2WyY=";
+  };
+
+  nativeBuildInputs = [
+    cpio
+    xar
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    xar -xf $src
+    zcat client.pkg/Payload | cpio -i
+
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R Applications $out
+  '';
+
+  dontBuild = true;
+
+  # Arq is notarized
+  dontFixup = true;
+
+  meta = {
+    changelog = "https://www.arqbackup.com/download/arqbackup/arq7_release_notes.html";
+    description = "Multi-cloud backup software for your Macs";
+    homepage = "https://www.arqbackup.com/";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = [ lib.maintainers.Enzime ];
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 4d0383a553f3..4af825176f8c 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "c377b57601f82f76d677b09e6bbabda732c18861",
-  "hash": "sha256-q0Qlslw5e1nHDqLfLi4AvD3vAzoWvz9/0/lMgqn+y8Y=",
-  "version": "2.24.0",
-  "depsHash": "sha256-s4U+Hgace+d+zRaHeJkxh6TWgClY6T+tlmoyZq7L7Rk=",
-  "clientDepsHash": "sha256-fAtr5GW8AInIDgSEjv1JwKW9GNZGYImD3LxerkUqH8k="
+  "rev": "f3f5f3b9bd540d311a6ab0a99b9317a5142755ea",
+  "hash": "sha256-tymJLs0gucJX0n0helxAkCrifG4uWcxaEBpgK7uVG2c=",
+  "version": "2.25.1",
+  "depsHash": "sha256-JFoE4jNyIfdk/uhhbdP3flcNRus8FvwRNrs+hf4YJ5E=",
+  "clientDepsHash": "sha256-s8fybUu3hJozX57RfsxBSy09QjOiVGO4vg7woOEqMi4="
 }
diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
index c9e5f682879f..64cafe4c63c2 100644
--- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
@@ -9,6 +9,7 @@
   dbus,
   dbus-test-runner,
   evolution-data-server,
+  extra-cmake-modules,
   glib,
   gst_all_1,
   gtest,
@@ -16,7 +17,9 @@
   libaccounts-glib,
   libayatana-common,
   libical,
+  mkcal,
   libnotify,
+  libsForQt5,
   libuuid,
   lomiri,
   pkg-config,
@@ -25,51 +28,57 @@
   systemd,
   tzdata,
   wrapGAppsHook3,
+  # Generates a different indicator
+  enableLomiriFeatures ? false,
 }:
 
 let
   edsDataDir = "${evolution-data-server}/share";
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "ayatana-indicator-datetime";
-  version = "24.5.1";
+  pname = "${if enableLomiriFeatures then "lomiri" else "ayatana"}-indicator-datetime";
+  version = "25.4.0";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-datetime";
     tag = finalAttrs.version;
-    hash = "sha256-rbKAixFjXOMYzduABmoIXissQXAoehfbkNntdtRyAqA=";
+    hash = "sha256-8E9ucy8I0w9DDzsLtzJgICz/e0TNqOHgls9LrgA5nk4=";
   };
 
-  postPatch = ''
-    # Override systemd prefix
-    substituteInPlace data/CMakeLists.txt \
-      --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
-      --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}'
-
-    # Looking for Lomiri schemas for code generation
-    substituteInPlace src/CMakeLists.txt \
-      --replace-fail '/usr/share/accountsservice' '${lomiri.lomiri-schemas}/share/accountsservice'
-  '';
+  postPatch =
+    ''
+      # Override systemd prefix
+      substituteInPlace data/CMakeLists.txt \
+        --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
+        --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}'
+    ''
+    + lib.optionalString enableLomiriFeatures ''
+      # Looking for Lomiri schemas for code generation
+      substituteInPlace src/CMakeLists.txt \
+        --replace-fail '/usr/share/accountsservice' '${lomiri.lomiri-schemas}/share/accountsservice'
+    '';
 
   strictDeps = true;
 
-  nativeBuildInputs = [
-    cmake
-    glib # for schema hook
-    intltool
-    pkg-config
-    wrapGAppsHook3
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      glib # for schema hook
+      intltool
+      pkg-config
+      wrapGAppsHook3
+    ]
+    ++ lib.optionals enableLomiriFeatures [
+      libsForQt5.wrapQtAppsHook
+    ];
 
   buildInputs =
     [
       ayatana-indicator-messages
-      evolution-data-server
       glib
       libaccounts-glib
       libayatana-common
-      libical
       libnotify
       libuuid
       properties-cpp
@@ -82,10 +91,30 @@ stdenv.mkDerivation (finalAttrs: {
     ])
     ++ (with lomiri; [
       cmake-extras
-      lomiri-schemas
-      lomiri-sounds
-      lomiri-url-dispatcher
-    ]);
+    ])
+    ++ (
+      if enableLomiriFeatures then
+        (
+          [
+            extra-cmake-modules
+            mkcal
+          ]
+          ++ (with libsForQt5; [
+            kcalendarcore
+            qtbase
+          ])
+          ++ (with lomiri; [
+            lomiri-schemas
+            lomiri-sounds
+            lomiri-url-dispatcher
+          ])
+        )
+      else
+        [
+          evolution-data-server
+          libical
+        ]
+    );
 
   nativeCheckInputs = [
     dbus
@@ -99,12 +128,31 @@ stdenv.mkDerivation (finalAttrs: {
     gtest
   ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
-    (lib.cmakeBool "GSETTINGS_COMPILE" true)
-    (lib.cmakeBool "ENABLE_LOMIRI_FEATURES" true)
-    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-  ];
+  dontWrapQtApps = true;
+
+  cmakeFlags =
+    [
+      (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
+      (lib.cmakeBool "GSETTINGS_COMPILE" true)
+      (lib.cmakeBool "ENABLE_LOMIRI_FEATURES" enableLomiriFeatures)
+      (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+    ]
+    ++ lib.optionals enableLomiriFeatures [
+      (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
+        lib.concatStringsSep ";" [
+          # Exclude tests
+          "-E"
+          (lib.strings.escapeShellArg "(${
+            lib.concatStringsSep "|" [
+              # Don't know why these fail yet
+              "^test-eds-ics-repeating-events"
+              "^test-eds-ics-nonrepeating-events"
+              "^test-eds-ics-missing-trigger"
+            ]
+          })")
+        ]
+      ))
+    ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
@@ -112,34 +160,51 @@ stdenv.mkDerivation (finalAttrs: {
 
   preCheck = ''
     export XDG_DATA_DIRS=${
-      lib.strings.concatStringsSep ":" [
-        # org.ayatana.common schema
-        (glib.passthru.getSchemaDataDirPath libayatana-common)
-
-        # loading EDS engines to handle ICS-loading
-        edsDataDir
-      ]
+      lib.strings.concatStringsSep ":" (
+        [
+          # org.ayatana.common schema
+          (glib.passthru.getSchemaDataDirPath libayatana-common)
+        ]
+        ++ lib.optionals (!enableLomiriFeatures) [
+          # loading EDS engines to handle ICS-loading
+          edsDataDir
+        ]
+      )
     }
   '';
 
-  # schema is already added automatically by wrapper, EDS needs to be added explicitly
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${edsDataDir}"
+  preFixup =
+    ''
+      gappsWrapperArgs+=(
+    ''
+    + (
+      if enableLomiriFeatures then
+        ''
+          "''${qtWrapperArgs[@]}"
+        ''
+      else
+        # schema is already added automatically by wrapper, EDS needs to be added explicitly
+        ''
+          --prefix XDG_DATA_DIRS : "${edsDataDir}"
+        ''
     )
-  '';
+    + ''
+      )
+    '';
 
   passthru = {
     ayatana-indicators = {
-      ayatana-indicator-datetime = [
-        "ayatana"
-        "lomiri"
+      "${if enableLomiriFeatures then "lomiri" else "ayatana"}-indicator-datetime" = [
+        (if enableLomiriFeatures then "lomiri" else "ayatana")
       ];
     };
-    tests = {
-      startup = nixosTests.ayatana-indicators;
-      lomiri = nixosTests.lomiri.desktop-ayatana-indicator-datetime;
-    };
+    tests =
+      {
+        startup = nixosTests.ayatana-indicators;
+      }
+      // lib.optionalAttrs enableLomiriFeatures {
+        lomiri = nixosTests.lomiri.desktop-ayatana-indicator-datetime;
+      };
     updateScript = gitUpdater { };
   };
 
@@ -152,7 +217,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime";
     changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ OPNA2608 ];
+    teams = [
+      lib.teams.lomiri
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index fbf7a0b5c97b..594f8e1f8f88 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -41,6 +41,7 @@
   cubeb,
   useDiscordRichPresence ? true,
   rapidjson,
+  enableSSE42 ? true, # Disable if your hardware doesn't support SSE 4.2 (mainly CPUs before 2011)
 }:
 let
   inherit (lib)
@@ -51,11 +52,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "azahar";
-  version = "2121.2";
+  version = "2122";
 
   src = fetchzip {
     url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zXkLew7tErPjygYIXPnimfZnekFMCzY+95TlW1DNQRc=";
+    hash = "sha256-isohwigDgqwPJxinBju1biAXC3CX3JrNJiQ1NY+NjRo=";
   };
 
   nativeBuildInputs = [
@@ -142,6 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
     (cmakeBool "ENABLE_CUBEB" enableCubeb)
     (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
+    (cmakeBool "ENABLE_SSE42" enableSSE42)
   ];
 
   meta = {
diff --git a/pkgs/by-name/ba/bagr/package.nix b/pkgs/by-name/ba/bagr/package.nix
new file mode 100644
index 000000000000..68eb4aede9e0
--- /dev/null
+++ b/pkgs/by-name/ba/bagr/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "bagr";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "pwinckles";
+    repo = "bagr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tvo9/ywPhYgqj4i+o6lYOmrVnLcyciM7HPdT2dKerO8=";
+  };
+
+  cargoHash = "sha256-r4tgDPyLxTjq/sxNLvlX/2MePUfOwNgranQSSbgDtu0=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Command line utility for interacting with BagIt bags (RFC 8493)";
+    homepage = "https://github.com/pwinckles/bagr";
+    license = lib.licenses.asl20;
+    mainProgram = "bagr";
+    maintainers = with lib.maintainers; [
+      jezcope
+    ];
+    platforms = with lib.platforms; unix ++ windows;
+  };
+})
diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index f65ebd810d35..c7e38b127353 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.29.2";
+  version = "1.29.4";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-xzbIAzZS6kCrFDcbh7uFWV8Rbs91yx25RVKeGMSM5Dc=";
+    hash = "sha256-LT0ZixIxUXqNyK08ue+fbDAk/g+ibJVWQbi/LLrdLuM=";
   };
 
-  npmDepsHash = "sha256-s2Bavzd1IGuI7HfdKLAsFWHmr1RxBZO/21KXt060jbI=";
+  npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4=";
   npmWorkspace = "packages/pyright";
 
   preBuild = ''
diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
new file mode 100644
index 000000000000..a664f9ead1ae
--- /dev/null
+++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "bash-pinyin-completion-rs";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "AOSC-Dev";
+    repo = "bash-pinyin-completion-rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-h4l4plGMn5WMhU60+m60Uf45UfPNDb0X+E2LK3U3jxw=";
+  };
+
+  strictDeps = true;
+
+  cargoHash = "sha256-SAegFsmn91xrWg0o7lHgk+vRqTQhabev9dP+Lbk/h5s=";
+
+  postInstall = ''
+    substituteInPlace scripts/bash_pinyin_completion \
+      --replace-fail 'bash-pinyin-completion-rs' "$out/bin/bash-pinyin-completion-rs" \
+      --replace-fail '#!/usr/bin/env bash' ""
+    install -Dm644 scripts/bash_pinyin_completion $out/etc/bash_completion.d/pinyin_completion.bash
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Simple completion script for pinyin, written in rust";
+    homepage = "https://github.com/AOSC-Dev/bash-pinyin-completion-rs";
+    changelog = "https://github.com/AOSC-Dev/bash-pinyin-completion-rs/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "bash-pinyin-completion-rs";
+  };
+})
diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index d68e21988b29..3f7de08e3406 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.51.0";
+  version = "4.52.0";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-GOI878JBRXrJsy0MRFyW6pH4UGj6ZOOqBElLUesqZ24=";
+    hash = "sha256-TGGDZzjVgRADJq5u4b5RznVzIxk2EUKM3Y2rbhgv7yQ=";
   };
 
   proxyVendor = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
     "cmd/benthos"
   ];
 
-  vendorHash = "sha256-S3rxNRr1O8+90VTUEFBPdo3uUftqSj8lvCNAdQNs7SQ=";
+  vendorHash = "sha256-lNn/lqY1Q/8mRERrgPuE9GEun6tqrVQjtVUGRJk5W+0=";
 
   #  doCheck = false;
 
diff --git a/pkgs/by-name/bi/biplanes-revival/package.nix b/pkgs/by-name/bi/biplanes-revival/package.nix
new file mode 100644
index 000000000000..a666de6ec8b3
--- /dev/null
+++ b/pkgs/by-name/bi/biplanes-revival/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  makeWrapper,
+  ninja,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "biplanes-revival";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "regular-dev";
+    repo = "biplanes-revival";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rdPcI4j84fVKNwv2OQ9gwC0X2CHlObYfSYkCMlcm4sM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+    ninja
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_image
+    SDL2_mixer
+  ];
+
+  strictDeps = true;
+
+  postInstall = ''
+    id="org.regular_dev.biplanes_revival"
+    install -Dm644 $src/flatpak-data/$id.desktop -t $out/share/applications
+    install -Dm644 $src/flatpak-data/$id.metainfo.xml -t $out/share/metainfo
+    install -Dm644 $src/flatpak-data/$id.svg -t $out/share/icons/hicolor/scalable/apps
+
+    # Move assets directory into the preferred location.
+    mkdir -p $out/share/biplanes-revival
+    mv $out/bin/assets $out/share/biplanes-revival
+
+    # Remove TimeUtils headers.
+    rm -rf $out/include
+  '';
+
+  postFixup = ''
+    # Set assets root, the default is the current working directory.
+    # The game automatically appends "/assets" to the variable.
+    wrapProgram $out/bin/BiplanesRevival \
+      --set BIPLANES_ASSETS_ROOT "$out/share/biplanes-revival";
+  '';
+
+  env.NIX_CFLAGS_COMPILE = "-I ../deps/TimeUtils/include";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    mainProgram = "BiplanesRevival";
+    description = "Old cellphone arcade recreated for PC";
+    homepage = "https://regular-dev.org/biplanes-revival";
+    changelog = "https://github.com/regular-dev/biplanes-revival/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ federicoschonborn ];
+  };
+})
diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index f72a9c357b16..2ccf6c392185 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "buffrs";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "helsing-ai";
     repo = "buffrs";
     tag = "v${version}";
-    hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI=";
+    hash = "sha256-VHzPOFOkwz3QlDt25gBbishM4ujtEPFjA21WuiNVw00=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y=";
+  cargoHash = "sha256-/cdBt23VSmwN/C2XdHeeRjUSqLWiEheqVl+hfEDKIP0=";
 
   # Disabling tests meant to work over the network, as they will fail
   # inside the builder.
diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index b0eb29fac132..c526ce7c59aa 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -7,6 +7,7 @@
   cacert,
   versionCheckHook,
   writableTmpDirAsHomeHook,
+  stdenv,
 }:
 let
   version = "4.10.0";
@@ -26,13 +27,24 @@ let
           substituteInPlace pyproject.toml --replace-fail "setuptools==75.8.0" "setuptools"
           substituteInPlace craft_application/git/_git_repo.py --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs"
         '';
+
+        disabledTestPaths = [
+          # These tests assert outputs of commands that assume Ubuntu-related output.
+          "tests/unit/services/test_lifecycle.py"
+        ];
+
+        disabledTests =
+          old.disabledTests
+          ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+            "test_process_grammar_full"
+          ];
       });
     };
   };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "charmcraft";
-  version = "3.5.0";
+  version = "3.5.1";
 
   pyproject = true;
 
@@ -40,7 +52,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "canonical";
     repo = "charmcraft";
     tag = version;
-    hash = "sha256-NIOfjd4r9mDP0x1IpIVJlU+Aza0a17bc3jDxtInrf4A=";
+    hash = "sha256-4zlUHttny6nIRhx/5aDz2sh1Va0+nN+7cezBGtt5Img=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix
index 46cfb239cd66..1611018bdb78 100644
--- a/pkgs/by-name/ch/chawan/package.nix
+++ b/pkgs/by-name/ch/chawan/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "chawan";
-  version = "0-unstable-2025-05-25";
+  version = "0-unstable-2025-06-14";
 
   src = fetchFromSourcehut {
     owner = "~bptato";
     repo = "chawan";
-    rev = "e571c8b1ede3a3c6dc4a5a4d0c6c8f48473076d2";
-    hash = "sha256-OBXc4jnB5Y+KXO9J7P1Z2HXkNCS+xnG+IGWw8wb66J8=";
+    rev = "288896b6f3da9bb6e4e24190d4163e031f8a2751";
+    hash = "sha256-/8pp1E4YAXXh8ORRHseIe48BIG14u8gNkmotA+CXPYY=";
   };
 
   patches = [ ./mancha-augment-path.diff ];
diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index dfcd36d4e7d0..9737cba556be 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -19,12 +19,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.119.0";
+  version = "1.122.0";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-e9tF/A7VnZblhS3GO3ezdEWqCYKHMwgwzbG4wmTw1sE=";
+    hash = "sha256-8q/oh/LjeOsfQSQBfnyhQjGIYtRLgyEENsyfgxyTnv0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index a757e07002aa..f94bf3a4040b 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -6,13 +6,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^1.0.21"
+        "@anthropic-ai/claude-code": "^1.0.24"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "1.0.21",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.21.tgz",
-      "integrity": "sha512-Ig+OPSl7e77SJrE2jB8p4qnnyS/+iGItttIxh0oxkZI3qSKu/K3Z7zx8r4YTDCo7XJsoYnV0MNsDBcXWa/YKUg==",
+      "version": "1.0.24",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.24.tgz",
+      "integrity": "sha512-4S6ly2297ngNlto7IFZeEicS9u0yRDhocOzndWFovGBb+iUoEPKdZa/rhVk/tcyCADL6S+mMkiGQOlqFDrN3JQ==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index ae6c5d44bc90..33b3efdb1307 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "1.0.21";
+  version = "1.0.24";
 
   nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-CtNY7CduAg/QWs58jFnJ/3CMRpRKrJzD49Gqw7kSsao=";
+    hash = "sha256-12nmnVM0/+rhWrkIQXttASKPZgGQMvrzWF/JDwR7If4=";
   };
 
-  npmDepsHash = "sha256-Sll/rt4TjxjfD6qFnAu3SQxv8JIKvH0NJGO0zJd9xpk=";
+  npmDepsHash = "sha256-0jrARMOuJCU5MEigk0iYspUUHCB6APbCxPpqcp+5ktA=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index cdfe44916f55..fb8c81e800d1 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "25.02.2";
+  version = "25.05";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-2wp9o1paWJWfxIvm9BDnsKX3GDUXKaPkpB89cwb6Oj8=";
+    hash = "sha256-ANYzpjVw9kGdsNvXW1A7sEug9utGmJTab87SqJSdgAc=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool
diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix
index e48717fea11c..3785fba4c8a1 100644
--- a/pkgs/by-name/cl/clipper2/package.nix
+++ b/pkgs/by-name/cl/clipper2/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clipper2";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "AngusJohnson";
     repo = "Clipper2";
     rev = "Clipper2_${version}";
-    hash = "sha256-UsTOqejcN8our4UswFBvPC5fV52qJfjQYoVMEU6vDPE=";
+    hash = "sha256-6lvzU93+UnArEtRe2mJ4YB16+5sDCrBcPzljNAEFt8M=";
   };
 
   sourceRoot = "${src.name}/CPP";
diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix
index 0ea8d752ba88..cbde13c0a97d 100644
--- a/pkgs/by-name/cl/clojure-lsp/package.nix
+++ b/pkgs/by-name/cl/clojure-lsp/package.nix
@@ -10,11 +10,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "clojure-lsp";
-  version = "2025.05.27-13.56.57";
+  version = "2025.06.06-19.04.49";
 
   src = fetchurl {
     url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar";
-    hash = "sha256-CIly8eufuI/ENgiamKfhnFe+0dssDKEl4MYDJf4Sm/k=";
+    hash = "sha256-MiCwqlgvA9u64Fs4kkJta34gtsapyelbU0be/9UBJsk=";
   };
 
   extraNativeImageBuildArgs = [
diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index be176f3ba897..486cc54baa92 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2025.5.0";
+  version = "2025.6.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = version;
-    hash = "sha256-ZnkE9x4A9HoiSXzvYuzyW/dH08r0aJUk/q6gFVgtTjk=";
+    hash = "sha256-yDYfOP1rsiTZqcVRRtTw82I2Vh0WdpUCB1VTWuX3GWs=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index 4c2176935ebc..bf636b299d32 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.21.3";
+  version = "2.21.4";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-faScyQ8Y9MOkWSYppAE09yEaL/+m3mPGkcfCtBsCdUk=";
+    hash = "sha256-iC6P/GhMw7Sf8Ic6oglB+GFLWBrZZ+YuOJbyNm99ypc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix
index 29ea331d3885..aa63c0393cc5 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-2025-06-03";
+  version = "0-unstable-2025-06-16";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cubeb";
-    rev = "24c170b2346bb675456449f51406dac6442a84a7";
-    hash = "sha256-/XTDaG48IFPFPrEcDd3IqX4bN+VbrpaHpzd/7N8J3a8=";
+    rev = "566c73da47668ca85817108b749a13ac9c3f5a9d";
+    hash = "sha256-qYDsRhVBHLOVpWwtRNUtnZRZZq9Rot1pOn+4let6v6I=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index b13f488b8546..acb9ace1912c 100644
--- a/pkgs/by-name/da/darkly/package.nix
+++ b/pkgs/by-name/da/darkly/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "darkly-qt${qtMajorVersion}";
-  version = "0.5.20";
+  version = "0.5.21";
 
   src = fetchFromGitHub {
     owner = "Bali10050";
     repo = "Darkly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3/oJbf7QHaFyBnrEnZFpWgXbRc5wAFj9RZ7iQEBSZNw=";
+    hash = "sha256-1WErpDYTlMW/889Efe3OUM3uwt5w+EttjOGoBolBZvE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index d8862fd64f5f..9f861c4ee4f3 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.89.1";
+  version = "1.89.2";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-G9uiG7fTDTx9wVH0bV7BeY2TpTEtTHDd0+z/+kLZiwU=";
+    hash = "sha256-IDR00pxEKQ5DQM+q0P/iRnsH80ZUbokZhbnBoomy2oQ=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index f2093583f6d9..bb4aaea097e9 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -74,11 +74,11 @@
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "cli_config": {
       "dependency": "transitive",
@@ -144,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a",
+        "sha256": "aa07dbe5f2294c827b7edb9a87bba44a9c15a3cc81bc8da2ca19b37322d30080",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.14.0"
+      "version": "1.14.1"
     },
     "crypto": {
       "dependency": "direct dev",
@@ -324,11 +324,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "logging": {
       "dependency": "transitive",
@@ -454,11 +454,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "9436fe11f82d7cc1642a8671e5aa4149ffa9ae9116e6cf6dd665fc0653e3825c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.0"
     },
     "pool": {
       "dependency": "direct main",
@@ -724,21 +724,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.1"
+      "version": "15.0.2"
     },
     "watcher": {
       "dependency": "direct main",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
@@ -784,11 +784,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "3202a47961c1a0af6097c9f8c1b492d705248ba309e6f7a72410422c05046851",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.0"
     },
     "yaml": {
       "dependency": "direct dev",
@@ -802,6 +802,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.7.0 <4.0.0"
+    "dart": ">=3.8.0 <4.0.0"
   }
 }
diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 7d075b238577..c2011fb7c83b 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.253.0";
+  version = "0.255.0";
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YSup167qj9yCgQEVf54ZYQ/zcprPWdQfkaTxh74eVCw=";
+    hash = "sha256-UoBlrNvvUbhcx5TGskDDppvnMtS1MnThcn+AVPfCjhg=";
   };
 
   # Otherwise these tests fail asserting that the version is 0.0.0-dev
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}"
   '';
 
-  vendorHash = "sha256-3tQgYRSCdEhnqUai8R2NFUR3gEDESQx0LfKlvKRF8Ss=";
+  vendorHash = "sha256-HS6btkCtGToEwIjUwgdNqeHgAK3YMCLK13yAuEzr4Qs=";
 
   excludedPackages = [
     "bundle/internal"
diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index c37453bfbfe2..f276a0d33477 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   fetchpatch,
   xz,
   dpkg,
@@ -29,11 +29,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.14";
+  version = "2.25.15";
 
-  src = fetchurl {
-    url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz";
-    hash = "sha256-z95BOgGNYFvleqCv8e6B7Tl91xPzgQHkcxIg55maXvQ=";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = "devscripts";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s2QSfJyHsFr1eiia/yFj3jsS5k38xNewEe/g5PFpqag=";
   };
 
   patches = [
diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix
index 55aa9d8a918a..2bed0cd4bc68 100644
--- a/pkgs/by-name/de/decker/package.nix
+++ b/pkgs/by-name/de/decker/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "decker";
-  version = "1.54";
+  version = "1.56";
 
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
     rev = "v${version}";
-    hash = "sha256-6rKfIMEWMig1LAaLk1eSUHnc2104FuN5wTVpf1SgCtg=";
+    hash = "sha256-b4Z+hQ7sQf8sdFXcX4+GA9Q8gJDUeb5LuVgrd3bY6vA=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/de/denort/package.nix b/pkgs/by-name/de/denort/package.nix
deleted file mode 100644
index 45069e059d11..000000000000
--- a/pkgs/by-name/de/denort/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  deno,
-  lib,
-}:
-deno.overrideAttrs (
-  final: prev: {
-    pname = "denort";
-    buildAndTestSubdir = "cli/rt";
-    postInstall = "";
-    installCheckPhase = "";
-    passthru = { };
-    meta = with lib; {
-      homepage = "https://deno.land/";
-      changelog = "https://github.com/denoland/deno/releases/tag/v${final.version}";
-      description = "Slim version of the deno runtime, usually bundled with deno projects into standalone binaries";
-      license = licenses.mit;
-      mainProgram = "denort";
-      maintainers = with maintainers; [
-        jk
-        ofalvai
-      ];
-      platforms = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-    };
-  }
-)
diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix
index 9c0d01fd5838..70485f72621d 100644
--- a/pkgs/by-name/di/digikam/package.nix
+++ b/pkgs/by-name/di/digikam/package.nix
@@ -94,6 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     kdePackages.wrapQtAppsHook
     wrapGAppsHook3
+
+    kdePackages.qtmultimedia
+    kdePackages.qtnetworkauth
+    kdePackages.qtscxml
+    kdePackages.qtwebengine
   ];
 
   # Based on <https://www.digikam.org/api/index.html#externaldeps>,
diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix
index cec812fe5ea9..74ac0efbfe90 100644
--- a/pkgs/by-name/do/doh-proxy-rust/package.nix
+++ b/pkgs/by-name/do/doh-proxy-rust/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "doh-proxy-rust";
-  version = "0.9.11";
+  version = "0.9.12";
 
   src = fetchCrate {
     inherit version;
     crateName = "doh-proxy";
-    hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek=";
+    hash = "sha256-Q+SjUB9XQlT+r1bjKJooqJ095yp5PMqMAQhoo+kp238=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04=";
+  cargoHash = "sha256-XEHeGduKsIFW0tXto8DcghzNYMGE/zkWY2cTg8ZcPcU=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
index dc8764653dce..7e7b985fca40 100644
--- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix
+++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix
@@ -52,14 +52,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolphin-emu-primehack";
-  version = "1.0.7a";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "shiiion";
     repo = "dolphin";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc=";
+    hash = "sha256-/9AabEJ2ZOvHeSGXWRuOucmjleBMRcJfhX+VDeldbgo=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/by-name/do/doulos-sil/package.nix b/pkgs/by-name/do/doulos-sil/package.nix
index b275d6e0df25..1cf052c0cd75 100644
--- a/pkgs/by-name/do/doulos-sil/package.nix
+++ b/pkgs/by-name/do/doulos-sil/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "doulos-sil";
-  version = "6.200";
+  version = "7.000";
 
   src = fetchzip {
     url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip";
-    hash = "sha256-kpbXJVAEQLr5HMFaE+8OgAYrMGQoetgMi0CcPn4a3Xw=";
+    hash = "sha256-i2M7YVBiLWUZETAZEesHdyQypoO5fbWHqhpizqVLB5E=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 1d47f31fe07d..aac966beef44 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/markfasheh/duperemove";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
-      bluescreen303
       thoughtpolice
     ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/dw/dwarfs/package.nix b/pkgs/by-name/dw/dwarfs/package.nix
index 00d94841c071..a43824fd2e87 100644
--- a/pkgs/by-name/dw/dwarfs/package.nix
+++ b/pkgs/by-name/dw/dwarfs/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   bison,
   boost,
+  brotli,
   cmake,
   double-conversion,
   fmt,
@@ -33,14 +34,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dwarfs";
-  version = "0.12.3";
+  version = "0.12.4";
 
   src = fetchFromGitHub {
     owner = "mhx";
     repo = "dwarfs";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-DIlGeZXWyM9rMzo/DNQlzSbNBIRJhe2viXFM/zT2heY=";
+    hash = "sha256-EYNnmv0QKdWddIRFRsuwsazHep3nrJ8lInlR4S67rME=";
   };
 
   cmakeFlags = [
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     parallel-hashmap
     nlohmann_json
     boost
+    brotli
     flac # optional; allows automatic audio compression
     fmt
     fuse3
@@ -117,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fast high compression read-only file system";
     homepage = "https://github.com/mhx/dwarfs";
     changelog = "https://github.com/mhx/dwarfs/blob/v${finalAttrs.version}/CHANGES.md";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.luftmensch-luftmensch ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 45f93496ccf3..ccc8f1652193 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web";
-  version = "1.0.10";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-WJz1Weh17DWH5qzMry1uacHBXY9ouIXWRzoiwzIsN0I=";
+    hash = "sha256-rHz/QlH3t+J2oz0s5LuWkgxGZmdiPFZXTuDI5yFajrA=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-9LC5WuS1CBj3vBacXUxJXyPgvZ/zfcihjZpCiH/8Aa0=";
+    hash = "sha256-9BumlPzvG6dmuoFGdCAALzKpJATA3ibb1SkLtofAasI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index b335ff256c18..b0cc10b7d621 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-yk7iv5nq2b/1OY77818I7mXW96YxjwwJS3iiv1KXVHs=";
+    hash = "sha256-4RF0XcDpUcMQ0u2FTRBnZdQDM7DlaI7pl5HukMbbbBE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ncTX9cDSAf6ZGlz0utGYxkuXcx85vt3VHQzdmQhCNf0=";
+  cargoHash = "sha256-c/BYf6SXOdI/K4t3fT4ycuILkIYCiSbHafLprSMvK8E=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index f438d6558e8b..c9e0b8f93e0d 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.196";
+  version = "1.4.209";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-g2f8xpS+KA1USt7lArodTo7m7OXnzew2LSFKeVclQOE=";
+    hash = "sha256-kRPFTs3w5MhlCax81GrZ82GWLMTDUiyXOI9lSp4Fwkc=";
   };
 
-  vendorHash = "sha256-xfNvmhHNYpanhZKT9o8kImzw4gzigpgc8ri9O1iOqwc=";
+  vendorHash = "sha256-GkAehT2oFG8cGe+PkceZios3ZG9S0CZs4L7slX+Dkck=";
 
   # Fabric introduced plugin tests that fail in the nix build sandbox.
   doCheck = false;
diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix
index 6508f3fe4c77..34f906501b14 100644
--- a/pkgs/by-name/fa/faircamp/package.nix
+++ b/pkgs/by-name/fa/faircamp/package.nix
@@ -15,19 +15,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "faircamp";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "simonrepp";
     repo = "faircamp";
     rev = version;
-    hash = "sha256-41mec9AdNdWRJz+5xFU7to/4LxIb7fEgm1EQVMAtyto=";
+    hash = "sha256-68wo95SjiCBS8cikMGZpnpYx7AqyIQ/szXMorirwVPk=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-xLRoI4MN1DApL4jXBXnMzsqTaOVUn2FZy3o2mTetvJ8=";
+  cargoHash = "sha256-YyzzkWgjEKl46CfAkbFdum+AWCO0YGTXDh86mtHtCQs=";
 
   buildFeatures = [ "libvips" ];
 
diff --git a/pkgs/by-name/fb/fbv/package.nix b/pkgs/by-name/fb/fbv/package.nix
index 16b813a2c1de..d1e51bc32807 100644
--- a/pkgs/by-name/fb/fbv/package.nix
+++ b/pkgs/by-name/fb/fbv/package.nix
@@ -1,39 +1,28 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
   getopt,
   libjpeg,
   libpng12,
-  giflib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fbv";
-  version = "1.0b";
+  version = "1.0c";
 
-  src = fetchurl {
-    url = "http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz";
-    sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv";
+  src = fetchFromGitHub {
+    owner = "jstkdng";
+    repo = "fbv";
+    tag = finalAttrs.version;
+    hash = "sha256-4tAIFklKsx2uI+FQjq9vdolYm6d6YWugioG6k2ZUMrs=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/void-linux/void-packages/4a5bfe522ea5afd8203e804dc6a642d0871cd6dd/srcpkgs/fbv/patches/giflib-5.1.patch";
-      sha256 = "00q1zcn92yvvyij68bnq0m1sr3a411w914f4nyp6mpz0j5xc6dc7";
-    })
-  ];
-
-  patchFlags = [ "-p0" ];
-
   buildInputs = [
     getopt
     libjpeg
     libpng12
-    giflib
   ];
-  makeFlags = [ "LDFLAGS=-lgif" ];
 
   enableParallelBuilding = true;
 
@@ -41,11 +30,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,man/man1}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "View pictures on a linux framebuffer device";
-    homepage = "http://s-tech.elsat.net.pl/fbv/";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ peterhoeg ];
+    homepage = "https://github.com/jstkdng/fbv";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ peterhoeg ];
     mainProgram = "fbv";
   };
-}
+})
diff --git a/pkgs/by-name/fe/fedigroups/Cargo.lock b/pkgs/by-name/fe/fedigroups/Cargo.lock
deleted file mode 100644
index 6a2cfdce28d4..000000000000
--- a/pkgs/by-name/fe/fedigroups/Cargo.lock
+++ /dev/null
@@ -1,2525 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-dependencies = [
- "byteorder",
- "safemem",
-]
-
-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "serde",
- "time",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-dependencies = [
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "elefren"
-version = "0.22.0"
-source = "git+https://git.ondrovo.com/MightyPork/elefren-fork.git?rev=b10e5935ae32f4756b19e9ca58b78a5382f865d1#b10e5935ae32f4756b19e9ca58b78a5382f865d1"
-dependencies = [
- "chrono",
- "doc-comment",
- "futures-util",
- "hyper-old-types",
- "isolang",
- "log 0.4.17",
- "reqwest",
- "serde",
- "serde_json",
- "serde_qs",
- "serde_urlencoded 0.6.1",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite",
- "tokio-util 0.6.7",
- "toml",
- "url 2.2.2",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log 0.4.17",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fedigroups"
-version = "0.4.5"
-dependencies = [
- "anyhow",
- "clap",
- "elefren",
- "env_logger",
- "futures 0.3.21",
- "json5",
- "log 0.4.17",
- "native-tls",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tokio-stream",
- "voca_rs",
- "websocket",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-
-[[package]]
-name = "futures-task"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-
-[[package]]
-name = "futures-util"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util 0.7.3",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "itoa 1.0.2",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes 1.1.0",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "0.10.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-dependencies = [
- "base64 0.9.3",
- "httparse",
- "language-tags",
- "log 0.3.9",
- "mime 0.2.6",
- "num_cpus",
- "time",
- "traitobject",
- "typeable",
- "unicase 1.4.2",
- "url 1.7.2",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
-dependencies = [
- "bytes 1.1.0",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa 1.0.2",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-old-types"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6896be51ecf3966c0fa14ff2da3233dbb9aef57ccea1be1afe55f105f4d4c9c4"
-dependencies = [
- "base64 0.9.3",
- "bytes 0.4.12",
- "httparse",
- "language-tags",
- "log 0.4.17",
- "mime 0.3.16",
- "percent-encoding 1.0.1",
- "time",
- "unicase 2.6.0",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
-dependencies = [
- "futures-util",
- "hyper 0.14.19",
- "log 0.4.17",
- "rustls",
- "tokio",
- "tokio-rustls",
- "webpki",
-]
-
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg 1.1.0",
- "hashbrown",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
-
-[[package]]
-name = "isolang"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5"
-dependencies = [
- "phf",
- "phf_codegen",
- "serde",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-
-[[package]]
-name = "js-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
-
-[[package]]
-name = "lock_api"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-dependencies = [
- "owning_ref",
- "scopeguard 0.3.3",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg 1.1.0",
- "scopeguard 1.1.0",
-]
-
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.17",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-dependencies = [
- "log 0.3.9",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime 0.3.16",
- "unicase 2.6.0",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log 0.4.17",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log 0.4.17",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
-dependencies = [
- "lazy_static",
- "libc",
- "log 0.4.17",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg 1.1.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
-dependencies = [
- "autocfg 1.1.0",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api 0.4.7",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version",
- "smallvec 0.6.14",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec 1.8.1",
- "windows-sys",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1 0.8.2",
-]
-
-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared",
- "rand 0.6.5",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.6",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.6",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.6",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
-dependencies = [
- "base64 0.13.0",
- "bytes 1.1.0",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "hyper 0.14.19",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log 0.4.17",
- "mime 0.3.16",
- "mime_guess",
- "percent-encoding 2.1.0",
- "pin-project-lite",
- "rustls",
- "serde",
- "serde_json",
- "serde_urlencoded 0.7.0",
- "tokio",
- "tokio-rustls",
- "url 2.2.2",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.0",
- "log 0.4.17",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
-
-[[package]]
-name = "safemem"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
-
-[[package]]
-name = "schannel"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
-dependencies = [
- "lazy_static",
- "windows-sys",
-]
-
-[[package]]
-name = "scopeguard"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[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-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "serde"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-dependencies = [
- "itoa 1.0.2",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_qs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a72808528a89fa9eca23bbb6a1eb92cb639b881357269b6510f11e50c0f8a9"
-dependencies = [
- "percent-encoding 2.1.0",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
-dependencies = [
- "dtoa",
- "itoa 0.4.8",
- "serde",
- "url 2.2.2",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
-dependencies = [
- "form_urlencoded",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
-
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "stfu8"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf70433e3300a3c395d06606a700cdf4205f4f14dbae2c6833127c6bb22db77"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "syn"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
-dependencies = [
- "bytes 1.1.0",
- "libc",
- "memchr",
- "mio 0.8.4",
- "num_cpus",
- "once_cell",
- "parking_lot 0.12.1",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-codec"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "tokio-io",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
-dependencies = [
- "crossbeam-utils",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log 0.4.17",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
-dependencies = [
- "crossbeam-utils",
- "futures 0.1.31",
- "lazy_static",
- "log 0.4.17",
- "mio 0.6.23",
- "num_cpus",
- "parking_lot 0.7.1",
- "slab",
- "tokio-executor",
- "tokio-io",
- "tokio-sync",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-sync"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7"
-dependencies = [
- "fnv",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "iovec",
- "mio 0.6.23",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-tls"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
-dependencies = [
- "futures 0.1.31",
- "native-tls",
- "tokio-io",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8"
-dependencies = [
- "futures-util",
- "log 0.4.17",
- "pin-project",
- "rustls",
- "tokio",
- "tokio-rustls",
- "tungstenite",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
-dependencies = [
- "bytes 1.1.0",
- "futures-core",
- "futures-sink",
- "log 0.4.17",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
-dependencies = [
- "bytes 1.1.0",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "traitobject"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "tungstenite"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"
-dependencies = [
- "base64 0.13.0",
- "byteorder",
- "bytes 1.1.0",
- "http",
- "httparse",
- "log 0.4.17",
- "rand 0.8.5",
- "rustls",
- "rustls-native-certs",
- "sha-1 0.9.8",
- "thiserror",
- "url 2.2.2",
- "utf-8",
- "webpki",
-]
-
-[[package]]
-name = "typeable"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-dependencies = [
- "version_check 0.1.5",
-]
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check 0.9.4",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna 0.2.3",
- "matches",
- "percent-encoding 2.1.0",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "voca_rs"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec29ce40c253a1579092852bbea5cb4fbcf34c04b91d8127300202aa17c998fc"
-dependencies = [
- "regex",
- "stfu8",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log 0.4.17",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
-dependencies = [
- "cfg-if 1.0.0",
- "serde",
- "serde_json",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log 0.4.17",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
-
-[[package]]
-name = "web-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "websocket"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723abe6b75286edc51d8ecabb38a2353f62a9e9b0588998b59111474f1dcd637"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "hyper 0.10.16",
- "native-tls",
- "rand 0.6.5",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
- "tokio-tcp",
- "tokio-tls",
- "unicase 1.4.2",
- "url 1.7.2",
- "websocket-base",
-]
-
-[[package]]
-name = "websocket-base"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403f3fd505ff930da84156389639932955fb09705b3dccd1a3d60c8e7ff62776"
-dependencies = [
- "base64 0.10.1",
- "bitflags",
- "byteorder",
- "bytes 0.4.12",
- "futures 0.1.31",
- "native-tls",
- "rand 0.6.5",
- "sha-1 0.8.2",
- "tokio-codec",
- "tokio-io",
- "tokio-tcp",
- "tokio-tls",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[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-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[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-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[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-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "winreg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
diff --git a/pkgs/by-name/fe/fedigroups/package.nix b/pkgs/by-name/fe/fedigroups/package.nix
index 743b0c8a75ae..6a3738fd06a7 100644
--- a/pkgs/by-name/fe/fedigroups/package.nix
+++ b/pkgs/by-name/fe/fedigroups/package.nix
@@ -9,29 +9,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fedigroups";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchFromGitea {
     domain = "git.ondrovo.com";
     owner = "MightyPork";
     repo = "group-actor";
     rev = "v${version}";
-    hash = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0=";
+    hash = "sha256-Sq22CwLLR10yrN3+dR2KDoS8r99+LWOH7+l+D3RWlKw=";
     forceFetchGit = true; # Archive generation is disabled on this gitea instance
     leaveDotGit = true; # git command in build.rs
   };
 
-  # The lockfile in the repo is not up to date
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "elefren-0.22.0" = "sha256-zCmopdkBHT0gzNGQqZzsnIyMyAt0XBbQdOCpegF6TsY=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-6UijHshvKANtMMfNADWDViDrh6bGlPvFz4xqJeWdqB0=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index aadc186af103..fbbe4ad8f67f 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/9bcfe8ba/Feishu-linux_x64-7.36.11.deb";
-      sha256 = "sha256-iqEcwfF6z2jJ0TmFzDu2gf6eapHcJPaLSVESgtC9WUg=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/91e64286/Feishu-linux_x64-7.42.17.deb";
+      sha256 = "sha256-Rsq+xQAyi7I1WcnkXzhPEgbUyfXU9XPVKIuv6Z9H5VA=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/484fc204/Feishu-linux_arm64-7.36.11.deb";
-      sha256 = "sha256-XTa5GOMBsiXI5IDhDQktSxdUfuvG7c2VWHuS76cFsqE=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/49127814/Feishu-linux_arm64-7.42.17.deb";
+      sha256 = "sha256-UykQk8R8EDsHmRGy9BfDXhEZFlYT16bAkRuLXFZJDHw=";
     };
   };
 
@@ -133,7 +133,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.36.11";
+  version = "7.42.17";
   pname = "feishu";
 
   src =
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 05264a6eb61e..e4eb04fffded 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.6.0";
+  version = "14.7.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-gMVP55hhgAWsI+NJ0au2/E955sa3uAJ/s+0OqMuvrG0=";
+    hash = "sha256-sZQoP6XsJkDI6I41eQv678aDtHhaRX6u03z/D6S7nBQ=";
   };
 
-  npmDepsHash = "sha256-YqRfxd3vSrZcQ7/9d2kNe3B/0ZDjcDUxr5CDthdD/tg=";
+  npmDepsHash = "sha256-QrJgImV7YCzME/ZwzwJP3FFvonmvCSm0hd9fLc8gyyk=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json
diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix
index 04212a7b5a06..b73b294a424b 100644
--- a/pkgs/by-name/fi/firezone-gui-client/package.nix
+++ b/pkgs/by-name/fi/firezone-gui-client/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  rust,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -24,12 +25,12 @@
   copyDesktopItems,
 }:
 let
-  version = "1.4.12";
+  version = "1.5.1";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gui-client-${version}";
-    hash = "sha256-jvrkAbXHFWdNInDCrktC7eMZQ2a/rzUxfCOny7nHQmQ=";
+    hash = "sha256-KozSy44Opx6cukA0QTXeMpI3fP49iyabFzPLIJckOZ4=";
   };
 
   frontend = stdenvNoCC.mkDerivation rec {
@@ -39,10 +40,12 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version;
       src = "${src}/rust/gui-client";
-      hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
+      hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4=";
     };
     pnpmRoot = "rust/gui-client";
 
+    env.GITHUB_SHA = version;
+
     nativeBuildInputs = [
       pnpm_9.configHook
       nodejs
@@ -52,8 +55,7 @@ let
       runHook preBuild
 
       cd $pnpmRoot
-      cp node_modules/flowbite/dist/flowbite.min.js src/
-      pnpm tailwindcss -i src/input.css -o src/output.css
+      node ./node_modules/flowbite-react/dist/cli/bin.js patch
       node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
 
       runHook postBuild
@@ -73,7 +75,7 @@ rustPlatform.buildRustPackage rec {
   inherit version src;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
+  cargoHash = "sha256-TDP1Z4MeQaSER8MGnCEQfIhRsakaSCeJ7boUMBYkkI0=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gui-client";
   RUSTFLAGS = "--cfg system_certs";
@@ -102,6 +104,9 @@ rustPlatform.buildRustPackage rec {
   postPatch = ''
     rm .cargo/config.toml
     ln -s ${frontend} gui-client/dist
+
+    substituteInPlace gui-client/src-tauri/tauri.conf.json \
+      --replace-fail '../../target' '../../target/${rust.envVars.rustHostPlatformSpec}'
   '';
 
   # Tries to compile apple specific crates due to workspace dependencies,
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index e9db47c6e101..0e6d8ee33284 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -12,14 +12,14 @@
 
 let
   pname = "flclash";
-  version = "0.8.85";
+  version = "0.8.86";
 
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-bMx9yQkzUZ8cJpT1WBIqmYKoUvkPND9qg26HoRiY5kM=";
+      hash = "sha256-bPMj9KWkup0nIhFAQ4BP8KiD8uP2/2b/GPy4APR+dho=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -62,7 +62,10 @@ flutter332.buildFlutterApplication {
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  gitHashes.flutter_js = "sha256-4PgiUL7aBnWVOmz2bcSxKt81BRVMnopabj5LDbtPYk4=";
+  gitHashes = {
+    flutter_js = "sha256-4PgiUL7aBnWVOmz2bcSxKt81BRVMnopabj5LDbtPYk4=";
+    re_editor = "sha256-PuaXoByTmkov2Dsz0kBHBHr/o63+jgPrnY9gpK7AOhA=";
+  };
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
index aa138a5eb469..6f16b118f660 100644
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -104,11 +104,11 @@
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -464,11 +464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "direct main",
@@ -879,11 +879,11 @@
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
@@ -959,11 +959,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.8"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1277,11 +1277,12 @@
     "re_editor": {
       "dependency": "direct main",
       "description": {
-        "name": "re_editor",
-        "sha256": "17e430f0591dd361992ec2dd6f69191c1853fa46e05432e095310a8f82ee820e",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "main",
+        "resolved-ref": "7cda330fc33d5ef9e00333048b70ce65a5f5d550",
+        "url": "https://github.com/chen08209/re-editor.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "0.7.0"
     },
     "re_highlight": {
@@ -1864,11 +1865,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix
index 256bd60429cb..3950922faf9a 100644
--- a/pkgs/by-name/fl/fluxcd-operator/package.nix
+++ b/pkgs/by-name/fl/fluxcd-operator/package.nix
@@ -9,16 +9,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "fluxcd-operator";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio-fluxcd";
     repo = "fluxcd-operator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SszWTuK3HVsyc669NThQn5VAVwD/7JQtKtqBJD6cTT0=";
+    hash = "sha256-fpqioVo9UtuyiXUOpHQmsrkssDaseUjllBmsQ7r39Ww=";
   };
 
-  vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";
+  vendorHash = "sha256-uR8FpJTzexFCM5M9K0h+80wlFnC0qNvQ/NMFnrVQWAo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index ee82e71dbcf9..d0473a3f8cf0 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -8,10 +8,10 @@
 }:
 
 let
-  version = "2.5.1";
-  srcHash = "sha256-BuFylOWR30aK7d1eN+9getR5amtAtkkhHNAPfdfASHs=";
-  vendorHash = "sha256-2fThvz/5A1/EyS6VTUQQa5Unx1BzYfsVRE18xOHtLHE=";
-  manifestsHash = "sha256-bIIK8igtx0gUcn3hlBohE0MG9PMhyThz4a71pkonBpE=";
+  version = "2.6.2";
+  srcHash = "sha256-0Q8U7i1hK2CVWia3t/ayjIzjNjHurhkRGO0oLHLNMH4=";
+  vendorHash = "sha256-LS2qgukhLk6nrjkp5Y00B0N/LFLzOUR/TC3qD80WZAQ=";
+  manifestsHash = "sha256-KXvYURCJ1/BI61jes0Pvy6giKvVmosWOHuzGRHCcqZo=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index babed86be830..d79c2532dd09 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.0.69";
+  version = "1.0.70";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-U90y8VxGrRgXTdrusImNK2kRO+Tw9uiXoMiEb3YgaBM=";
+    hash = "sha256-E+fwtD0AcUCHhHrnR7OV2mnDtGUnkJkLBKl6DbXlooU=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index e10f0d8710e2..c72da6602620 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.49.1";
+  version = "0.49.2";
 in
 buildGoModule {
   inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-gDRw/YQtIpYiX3uKjvmttbVkohj2k5f+pvv+xYyY3S8=";
+    hash = "sha256-u90cQh6mYUrlnWUkwIAhkJJZ6GB0AkNIJVJVkq4cYEM=";
   };
 
   vendorHash = "sha256-4LJwb4ZXs+CUcxhvRveJy+xu7/UEjxIEwLV5Z5gBbT4=";
diff --git a/pkgs/by-name/ge/geist-font/package.nix b/pkgs/by-name/ge/geist-font/package.nix
index 4384243ad7f1..f3445bea363a 100644
--- a/pkgs/by-name/ge/geist-font/package.nix
+++ b/pkgs/by-name/ge/geist-font/package.nix
@@ -6,20 +6,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "geist-font";
-  version = "1.4.01";
+  version = "1.5.0";
 
   srcs = [
     (fetchzip {
-      name = "geist-mono";
-      url = "https://github.com/vercel/geist-font/releases/download/${finalAttrs.version}/GeistMono-${finalAttrs.version}.zip";
-      stripRoot = false;
-      hash = "sha256-NVPSG2Flm78X5+KXUqlTiGrquD/FGuI1C3PFcIqdyl8=";
-    })
-    (fetchzip {
-      name = "geist-sans";
-      url = "https://github.com/vercel/geist-font/releases/download/${finalAttrs.version}/Geist-v${finalAttrs.version}.zip";
-      stripRoot = false;
-      hash = "sha256-r3Ix+UhxL/UosCLsWl52N55D+rGonQK9TIRfu4hGiwE=";
+      url = "https://github.com/vercel/geist-font/releases/download/${finalAttrs.version}/geist-font-${finalAttrs.version}.zip";
+      hash = "sha256-p3nFuaQPvw4PLcb5AOhu9jiNCTzZD7st1MuJKTAzwKE=";
     })
   ];
 
@@ -28,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -D geist-{mono,sans}/*/otf/*.otf -t $out/share/fonts/opentype
+    install -D source/fonts/{Geist,GeistMono}/otf/*.otf -t $out/share/fonts/opentype
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index 0d2db4ad01ba..b5c18a84eb26 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  pnpm_9,
+  pnpm_10,
   nodejs,
   electron,
   makeDesktopItem,
@@ -25,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     copyDesktopItems
     imagemagick
     makeWrapper
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-4Ite75ZMMSbPnmNcpoYaggiH9r2xQYkOnl29CF/6swA=";
+    hash = "sha256-eIvqZ9a+foYH+jXuqGz1m/4C+0Xq8mTvm7ZajKeOw58=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
index cb611aa4f22a..6611b389a878 100644
--- a/pkgs/by-name/gl/glamoroustoolkit/package.nix
+++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix
@@ -17,6 +17,7 @@
   libXi,
   libXrandr,
   libXrender,
+  libxkbcommon,
   libgit2,
   libglvnd,
   libuuid,
@@ -91,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
         libXi
         libXrandr
         libXrender
+        libxkbcommon
         libglvnd
         libuuid
         libxcb
@@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
         --set-rpath "${libPath}:$out/lib" \
         $out/lib/libPharoVMCore.so \
         $out/lib/libWinit.so \
+        $out/lib/libWinit30.so \
         $out/lib/libPixels.so
       patchelf --set-rpath $out/lib $out/lib/libssl.so
 
diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix
index 201e6e133796..61a307422cce 100644
--- a/pkgs/by-name/gn/gnucap/package.nix
+++ b/pkgs/by-name/gn/gnucap/package.nix
@@ -1,8 +1,6 @@
 {
   callPackage,
   fetchFromSavannah,
-  gnucap,
-  gnucap-full,
   installShellFiles,
   lib,
   readline,
@@ -12,36 +10,20 @@
   writeScript,
 }:
 
-let
-  version = "20240220";
-  meta = with lib; {
-    description = "Gnu Circuit Analysis Package";
-    longDescription = ''
-      Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives.
-      It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
-    '';
-    homepage = "http://www.gnucap.org/";
-    changelog = "https://git.savannah.gnu.org/gitweb/?p=gnucap.git;a=blob;f=NEWS";
-    license = licenses.gpl3Only;
-    platforms = platforms.all;
-    broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH
-    maintainers = [ maintainers.raboof ];
-    mainProgram = "gnucap";
-  };
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnucap";
-  inherit version;
+  version = "20240220";
 
   src = fetchFromSavannah {
     repo = "gnucap";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-aZMiNKwI6eQZAxlF/+GoJhKczohgGwZ0/Wgpv3+AhYY=";
   };
 
   nativeBuildInputs = [
     installShellFiles
   ];
+
   buildInputs = [
     readline
     termcap
@@ -53,42 +35,59 @@ stdenv.mkDerivation {
     installManPage man/*
   '';
 
-  passthru.tests = {
-    verilog = runCommand "gnucap-verilog-test" { } ''
-      echo "attach mgsim" | ${gnucap-full}/bin/gnucap -a msgsim > $out
-      cat $out | grep "verilog: already installed"
-    '';
+  passthru = {
+    tests = {
+      verilog = runCommand "gnucap-verilog-test" { } ''
+        echo "attach mgsim" | ${
+          finalAttrs.finalPackage.withPlugins (p: [ p.verilog ])
+        }/bin/gnucap -a msgsim > $out
+        cat $out | grep "verilog: already installed"
+      '';
+    };
+
+    plugins = callPackage ./plugins.nix { };
+    withPlugins =
+      p:
+      let
+        gnucap = finalAttrs.finalPackage;
+        selectedPlugins = p gnucap.plugins;
+        wrapper = writeScript "gnucap" ''
+          export GNUCAP_PLUGPATH=${gnucap}/lib/gnucap
+          for plugin in ${builtins.concatStringsSep " " selectedPlugins}; do
+            export GNUCAP_PLUGPATH=$plugin/lib/gnucap:$GNUCAP_PLUGPATH
+          done
+          ${lib.getExe gnucap}
+        '';
+      in
+      stdenv.mkDerivation {
+        pname = "${finalAttrs.pname}-with-plugins";
+        inherit (finalAttrs) version;
+
+        propagatedBuildInputs = selectedPlugins;
+
+        dontUnpack = true;
+
+        installPhase = ''
+          mkdir -p $out/bin
+          cp ${wrapper} $out/bin/gnucap
+        '';
+
+        inherit (finalAttrs) meta;
+      };
   };
 
-  inherit meta;
-}
-// {
-  plugins = callPackage ./plugins.nix { };
-  withPlugins =
-    p:
-    let
-      selectedPlugins = p gnucap.plugins;
-      wrapper = writeScript "gnucap" ''
-        export GNUCAP_PLUGPATH=${gnucap}/lib/gnucap
-        for plugin in ${builtins.concatStringsSep " " selectedPlugins}; do
-          export GNUCAP_PLUGPATH=$plugin/lib/gnucap:$GNUCAP_PLUGPATH
-        done
-        ${lib.getExe gnucap}
-      '';
-    in
-    stdenv.mkDerivation {
-      pname = "gnucap-with-plugins";
-      inherit version;
-
-      propagatedBuildInputs = selectedPlugins;
-
-      dontUnpack = true;
-
-      installPhase = ''
-        mkdir -p $out/bin
-        cp ${wrapper} $out/bin/gnucap
-      '';
-
-      inherit meta;
-    };
-}
+  meta = {
+    description = "Gnu Circuit Analysis Package";
+    longDescription = ''
+      Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives.
+      It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis.
+    '';
+    homepage = "http://www.gnucap.org/";
+    changelog = "https://git.savannah.gnu.org/gitweb/?p=gnucap.git;a=blob;f=NEWS";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin; # Relies on LD_LIBRARY_PATH
+    maintainers = [ lib.maintainers.raboof ];
+    mainProgram = "gnucap";
+  };
+})
diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix
index 66ec2adea344..f92e86b05839 100644
--- a/pkgs/by-name/go/go-swagger/package.nix
+++ b/pkgs/by-name/go/go-swagger/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-swagger";
-  version = "0.31.0";
+  version = "0.32.3";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = "go-swagger";
     tag = "v${version}";
-    hash = "sha256-PeH9bkRObsw4+ttuWhaPfPQQTOAw8pwlgTEtPoUBiIQ=";
+    hash = "sha256-L6EfHNwykqGtA1CZd/Py6QqeCz10VGjX/lEVHs6VB6g=";
   };
 
-  vendorHash = "sha256-PBzJMXPZ2gVdrW3ZeerhR1BeT9vWIIS1vCTjz3UFHes=";
+  vendorHash = "sha256-UQbPVrLehl2jwGXdJPrRo6JsAd/2A+NKEQwkRr3reOY=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix
index b2e1bc6d6d13..ab08580ed1bc 100644
--- a/pkgs/by-name/go/gollama/package.nix
+++ b/pkgs/by-name/go/gollama/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gollama";
-  version = "v1.33.2";
+  version = "v1.34.0";
 
   src = fetchFromGitHub {
     owner = "sammcj";
     repo = "gollama";
     tag = "v${version}";
-    hash = "sha256-WqbF1oWQBivtv3oV6UU8vDgT1re+WVgb89sTggs7uWw=";
+    hash = "sha256-gWEm5aUVq2yfxuZ6GxITiAAsn5gj1HR9I7seyRX8DoA=";
   };
 
-  vendorHash = "sha256-bXawl7ZanbVMA/ez+UOwQF1jV9VW5QH+0/2I50Biz4g=";
+  vendorHash = "sha256-7e1wM2FDaQGAIhb0gERy/RgJupra1B52SgTV0EHD570=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix
index 70e9133beb21..53b17f3a9157 100644
--- a/pkgs/by-name/go/gopls/package.nix
+++ b/pkgs/by-name/go/gopls/package.nix
@@ -11,27 +11,26 @@
 
 buildGoLatestModule (finalAttrs: {
   pname = "gopls";
-  version = "0.18.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "tools";
     tag = "gopls/v${finalAttrs.version}";
-    hash = "sha256-5w6R3kaYwrZyhIYjwLqfflboXT/z3HVpZiowxeUyaWg=";
+    hash = "sha256-2K93S7ApzHmsbeReKoSmIhgXuZR3oFODiTWDTO5wDOU=";
   };
 
   modRoot = "gopls";
-  vendorHash = "sha256-/tca93Df90/8K1dqhOfUsWSuFoNfg9wdWy3csOtFs6Y=";
+  vendorHash = "sha256-uWbcf/PadGXw2ryg6GjJrHzrZ88kKzfhr6gtYsLTvkg=";
 
   # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
   ldflags = [ "-X main.version=v${finalAttrs.version}" ];
 
   doCheck = false;
 
-  # Only build gopls, gofix, modernize, and not the integration tests or documentation generator.
+  # Only build gopls & modernize, not the integration tests or documentation generator.
   subPackages = [
     "."
-    "internal/analysis/gofix/cmd/gofix"
     "internal/analysis/modernize/cmd/modernize"
   ];
 
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 3bbb52e5fb7a..837ea06a44ae 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gpac.wp.imt.fr";
     license = licenses.lgpl21;
     maintainers = with maintainers; [
-      bluescreen303
       mgdelacroix
     ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/gr/gretl/package.nix b/pkgs/by-name/gr/gretl/package.nix
index 2f811e9e4e5d..17ce63306bd2 100644
--- a/pkgs/by-name/gr/gretl/package.nix
+++ b/pkgs/by-name/gr/gretl/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gretl";
-  version = "2025a";
+  version = "2025b";
 
   src = fetchurl {
     url = "mirror://sourceforge/gretl/gretl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-5B9V1Z12+Hu00x++u2ndUXWq91k/SXy723DoLOefhEQ=";
+    hash = "sha256-DW0QXWbx0nMWTfjxO15ZGR/DsvFM7eee0DDsqrm5vHM=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 3497f561e4d1..2aa369b8ea19 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Q2EFtkRGi/CwDYc2nERNXzRQNGKHAgYty2uigbOEo6E=";
+    hash = "sha256-ju0/6fAcCYZAfuDklRIEWqnM39z1BQeEx1H1l/Uzyf4=";
   };
 
   vendorHash = "sha256-3H/fdqmIRLOl0m4DHnF7pwRR7ud8YXI2fepXC0kcLNo=";
diff --git a/pkgs/by-name/ho/honk/package.nix b/pkgs/by-name/ho/honk/package.nix
index 039ba24333f9..2d8ddf007e89 100644
--- a/pkgs/by-name/ho/honk/package.nix
+++ b/pkgs/by-name/ho/honk/package.nix
@@ -9,11 +9,11 @@
 
 buildGoModule rec {
   pname = "honk";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz";
-    hash = "sha256-uswlReJzPjkVOazKmMHtetVukunroesqYc8XCJHiOxQ=";
+    hash = "sha256-VOeA2oQNmcEVfvWrKnWWUz6n+WjMuxYQnbqPfWaHGLM=";
   };
   vendorHash = null;
 
diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 31c980998aa4..c3eb3d959dbd 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -24,13 +24,13 @@ in
 # This base is used in horizon-eda and python3Packages.horizon-eda
 rec {
   pname = "horizon-eda";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "horizon-eda";
     repo = "horizon";
     rev = "v${version}";
-    hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs=";
+    hash = "sha256-Y2oopRycYSxtiKuQZSfTBVP7RmpZ0JA+QyZgnrpoAes=";
   };
 
   nativeBuildInputs = [
@@ -56,13 +56,9 @@ rec {
   ];
 
   env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-fpermissive"
-    ];
+    CASROOT = opencascade-occt;
   };
 
-  CASROOT = opencascade-occt;
-
   meta = {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://horizon-eda.org";
diff --git a/pkgs/by-name/ho/horizon-eda/package.nix b/pkgs/by-name/ho/horizon-eda/package.nix
index dcea3c1cddf0..f03763e98fc8 100644
--- a/pkgs/by-name/ho/horizon-eda/package.nix
+++ b/pkgs/by-name/ho/horizon-eda/package.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation {
     version
     src
     meta
-    CASROOT
     env
     ;
 
diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix
index b5491abd696c..996479f9c3db 100644
--- a/pkgs/by-name/hy/hyprshell/package.nix
+++ b/pkgs/by-name/hy/hyprshell/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprshell";
-  version = "4.2.1";
+  version = "4.2.5";
 
   src = fetchFromGitHub {
     owner = "H3rmt";
-    repo = "hyprswitch";
+    repo = "hyprshell";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SLLc1NCH8fvql1aSI9Uddt+oZoJVjv19UoLPPLoW/Vs=";
+    hash = "sha256-J6e2VyakM+8V/s5tSK9bEUfFHSGkyVaCCBZ/zQuMEOE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GCMsTCIQO3YSRu5kVyQwoH0tCHx2F+7PBZdhu35FhhQ=";
+  cargoHash = "sha256-ywTS6c+oxkaTmbVal08T0lrNIkqKJNE0Ovs98Yo6pOM=";
 
   nativeBuildInputs = [
     wrapGAppsHook4
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "CLI/GUI that allows switching between windows in Hyprland";
     mainProgram = "hyprshell";
-    homepage = "https://github.com/H3rmt/hyprswitch";
+    homepage = "https://github.com/H3rmt/hyprshell";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ arminius-smh ];
diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 0f8399f9e4a5..84f2306c8437 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.56.0";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = "i2pd";
     tag = version;
-    hash = "sha256-URFLVMd1j/br+/isQytVjSVosMHn1SEwqg2VNxStD0A=";
+    hash = "sha256-+LywTG+AXOas6fXF1pXjBkqa+fUbaWNMA3EqCEZfc/A=";
   };
 
   postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix
index e08ffe448900..c741c6b5337a 100644
--- a/pkgs/by-name/id/ida-free/package.nix
+++ b/pkgs/by-name/id/ida-free/package.nix
@@ -22,7 +22,7 @@
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: rec {
   pname = "ida-free";
   version = "9.1";
 
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
 
     # IDA depends on quite some things extracted by the runfile, so first extract everything
     # into $out/opt, then remove the unnecessary files and directories.
-    IDADIR=$out/opt
+    IDADIR=$out/opt/${finalAttrs.pname}-${finalAttrs.version}
 
     # The installer doesn't honor `--prefix` in all places,
     # thus needing to set `HOME` here.
@@ -127,4 +127,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ]; # Right now, the installation script only supports Linux.
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
-}
+})
diff --git a/pkgs/by-name/ip/ipset/package.nix b/pkgs/by-name/ip/ipset/package.nix
index 72bdb9889138..b9dc3f112aaa 100644
--- a/pkgs/by-name/ip/ipset/package.nix
+++ b/pkgs/by-name/ip/ipset/package.nix
@@ -6,13 +6,13 @@
   libmnl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ipset";
   version = "7.24";
 
   src = fetchurl {
-    url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-++NCTf8iLBy15cNNOLZFJLIhfOgCJsFP3LsTsp6jYRI=";
+    url = "https://ipset.netfilter.org/ipset-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-++NCTf8iLBy15cNNOLZFJLIhfOgCJsFP3LsTsp6jYRI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     description = "Administration tool for IP sets";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    mainProgram = "ipset";
   };
-}
+})
diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix
index 18eef4c57a74..3ac84d6a4fac 100644
--- a/pkgs/by-name/is/isolate/package.nix
+++ b/pkgs/by-name/is/isolate/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "isolate";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "ioi";
     repo = "isolate";
     rev = "v${version}";
-    hash = "sha256-kKXkXPVB9ojyIERvEdkHkXC//Agin8FPcpTBmTxh/ZE=";
+    hash = "sha256-mTh2IAh4xtLWlRu7gp3aXsGJdUWXnocvDyi8JZwzz9s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index 2676ee83eb43..ce310657a917 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
       downloaded and the java code runs.
     '';
     homepage = "https://www.jbang.dev";
+    sourceProvenance = with lib.sourceTypes; [
+      binaryBytecode
+    ];
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ moaxcp ];
diff --git a/pkgs/by-name/jb/jbrowse/package.nix b/pkgs/by-name/jb/jbrowse/package.nix
index fdc5c8e88d9d..89257e37f013 100644
--- a/pkgs/by-name/jb/jbrowse/package.nix
+++ b/pkgs/by-name/jb/jbrowse/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "jbrowse";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage";
-    sha256 = "sha256-UAuKbfvJuCDIaERFVYo6rdhBG2ycp87ZnCrVPLDDv9g=";
+    sha256 = "sha256-1swQIG9rCzk2wP7apYo4UjUE+enMK/ZrMu1q4/ahfjA=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index bcad3fc51150..c2ffbfd54493 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -55,9 +55,6 @@ let
     src = appimageTools.extractType2 {
       inherit pname version;
       src = source + "/jetbrains-toolbox";
-      postExtract = ''
-        patchelf --add-rpath ${lib.makeLibraryPath [ icu ]} $out/jetbrains-toolbox
-      '';
     };
 
     nativeBuildInputs = [ makeWrapper ];
@@ -66,7 +63,12 @@ let
       install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop
       install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
       wrapProgram $out/bin/jetbrains-toolbox \
-        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator-gtk3 ]} \
+        --prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath [
+            icu
+            libappindicator-gtk3
+          ]
+        } \
         --append-flags "--update-failed"
     '';
 
diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix
index 15834b8866e4..5e7ccc9d91a7 100644
--- a/pkgs/by-name/ju/justbuild/package.nix
+++ b/pkgs/by-name/ju/justbuild/package.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "justbuild";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "just-buildsystem";
     repo = "justbuild";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Vde8/oOZ6djf4b/eXykzdsG+a+huWNbTZQFzr/YeXq4=";
+    hash = "sha256-1qVe2s3MCmFm4hAwFwGn1jj6eVcBnvhvuK3OnNEuxQM=";
   };
 
   bazelapi = fetchurl {
diff --git a/pkgs/by-name/ka/kamal/Gemfile b/pkgs/by-name/ka/kamal/Gemfile
new file mode 100644
index 000000000000..08283a183739
--- /dev/null
+++ b/pkgs/by-name/ka/kamal/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem "kamal"
diff --git a/pkgs/by-name/ka/kamal/Gemfile.lock b/pkgs/by-name/ka/kamal/Gemfile.lock
new file mode 100644
index 000000000000..00f2d9fd0457
--- /dev/null
+++ b/pkgs/by-name/ka/kamal/Gemfile.lock
@@ -0,0 +1,73 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.3.0)
+    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    dotenv (3.1.8)
+    drb (2.2.3)
+    ed25519 (1.4.0)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    kamal (2.6.1)
+      activesupport (>= 7.0)
+      base64 (~> 0.2)
+      bcrypt_pbkdf (~> 1.0)
+      concurrent-ruby (~> 1.2)
+      dotenv (~> 3.1)
+      ed25519 (~> 1.4)
+      net-ssh (~> 7.3)
+      sshkit (>= 1.23.0, < 2.0)
+      thor (~> 1.3)
+      zeitwerk (>= 2.6.18, < 3.0)
+    logger (1.7.0)
+    minitest (5.25.5)
+    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)
+    ostruct (0.6.1)
+    securerandom (0.4.1)
+    sshkit (1.24.0)
+      base64
+      logger
+      net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
+      net-ssh (>= 2.8.0)
+      ostruct
+    thor (1.3.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.3)
+    zeitwerk (2.7.3)
+
+PLATFORMS
+  arm64-darwin
+  ruby
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  kamal
+
+BUNDLED WITH
+   2.5.22
diff --git a/pkgs/by-name/ka/kamal/gemset.nix b/pkgs/by-name/ka/kamal/gemset.nix
new file mode 100644
index 000000000000..0e54671df57c
--- /dev/null
+++ b/pkgs/by-name/ka/kamal/gemset.nix
@@ -0,0 +1,280 @@
+{
+  activesupport = {
+    dependencies = [
+      "base64"
+      "benchmark"
+      "bigdecimal"
+      "concurrent-ruby"
+      "connection_pool"
+      "drb"
+      "i18n"
+      "logger"
+      "minitest"
+      "securerandom"
+      "tzinfo"
+      "uri"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      type = "gem";
+    };
+    version = "8.0.2";
+  };
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  bcrypt_pbkdf = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04rb3rp9bdxn1y3qiflfpj7ccwb8ghrfbydh5vfz1l9px3fpg41g";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
+      type = "gem";
+    };
+    version = "0.4.1";
+  };
+  bigdecimal = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  concurrent-ruby = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
+      type = "gem";
+    };
+    version = "1.3.5";
+  };
+  connection_pool = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  dotenv = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy";
+      type = "gem";
+    };
+    version = "3.1.8";
+  };
+  drb = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  ed25519 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  i18n = {
+    dependencies = [ "concurrent-ruby" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
+      type = "gem";
+    };
+    version = "1.14.7";
+  };
+  kamal = {
+    dependencies = [
+      "activesupport"
+      "base64"
+      "bcrypt_pbkdf"
+      "concurrent-ruby"
+      "dotenv"
+      "ed25519"
+      "net-ssh"
+      "sshkit"
+      "thor"
+      "zeitwerk"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ak5yn5i99prqhyr0qry90lhi30z3qpyai8pkjs4nfs8b9fski0z";
+      type = "gem";
+    };
+    version = "2.6.1";
+  };
+  logger = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  minitest = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      type = "gem";
+    };
+    version = "5.25.5";
+  };
+  net-scp = {
+    dependencies = [ "net-ssh" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0p8s7l4pr6hkn0l6rxflsc11alwi1kfg5ysgvsq61lz5l690p6x9";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  net-sftp = {
+    dependencies = [ "net-ssh" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  net-ssh = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1w1ypxa3n6mskkwb00b489314km19l61p5h3bar6zr8cng27c80p";
+      type = "gem";
+    };
+    version = "7.3.0";
+  };
+  ostruct = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  securerandom = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc";
+      type = "gem";
+    };
+    version = "0.4.1";
+  };
+  sshkit = {
+    dependencies = [
+      "base64"
+      "logger"
+      "net-scp"
+      "net-sftp"
+      "net-ssh"
+      "ostruct"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0v4fc9yaqljwax370438p3ps59jpimvkkj1d5xsfk2kphkww35wm";
+      type = "gem";
+    };
+    version = "1.24.0";
+  };
+  thor = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  tzinfo = {
+    dependencies = [ "concurrent-ruby" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
+      type = "gem";
+    };
+    version = "2.0.6";
+  };
+  uri = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  zeitwerk = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
+      type = "gem";
+    };
+    version = "2.7.3";
+  };
+}
diff --git a/pkgs/by-name/ka/kamal/package.nix b/pkgs/by-name/ka/kamal/package.nix
new file mode 100644
index 000000000000..628ec7bedbca
--- /dev/null
+++ b/pkgs/by-name/ka/kamal/package.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  ruby,
+  bundlerApp,
+  bundlerUpdateScript,
+}:
+
+bundlerApp {
+  pname = "kamal";
+  gemdir = ./.;
+  inherit ruby;
+
+  exes = [ "kamal" ];
+
+  meta = with lib; {
+    description = "Kamal: Deploy web apps anywhere";
+    homepage = "https://kamal-deploy.org/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nathanruiz ];
+    mainProgram = "kamal";
+  };
+}
diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix
index f7cc87b06e14..e105977a99ad 100644
--- a/pkgs/by-name/ke/keepalived/package.nix
+++ b/pkgs/by-name/ke/keepalived/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "keepalived";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
     rev = "v${version}";
-    sha256 = "sha256-+IwV8ifQ8gWN4eR9Fgvw3HV3WJDmy3urEQDLngoMdm8=";
+    sha256 = "sha256-Xv/UGIeZhRHQO5lxkaWgHDUW+3qBi3wFU4+Us1A2uE0=";
   };
 
   buildInputs =
diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix
index 170cc7bfe8e3..40b6dc15170f 100644
--- a/pkgs/by-name/ke/keepassxc/package.nix
+++ b/pkgs/by-name/ke/keepassxc/package.nix
@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
       libXi
       libXtst
       libargon2
-      libsForQt5.kio
       libsForQt5.qtbase
       libsForQt5.qtsvg
       minizip
diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix
index 974d71af3065..2ca0858819ec 100644
--- a/pkgs/by-name/kh/khal/package.nix
+++ b/pkgs/by-name/kh/khal/package.nix
@@ -5,6 +5,7 @@
   glibcLocales,
   installShellFiles,
   python3Packages,
+  sphinxHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,6 +28,9 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [
     glibcLocales
     installShellFiles
+    sphinxHook
+    python3Packages.sphinx-rtd-theme
+    python3Packages.sphinxcontrib-newsfeed
   ];
 
   dependencies = with python3Packages; [
@@ -54,6 +58,16 @@ python3Packages.buildPythonApplication rec {
     vdirsyncer
   ];
 
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+  sphinxBuilders = [
+    "html"
+    "man"
+  ];
+
   postInstall = ''
     # shell completions
     installShellCompletion --cmd khal \
@@ -61,18 +75,6 @@ python3Packages.buildPythonApplication rec {
       --zsh <(_KHAL_COMPLETE=zsh_source $out/bin/khal) \
       --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal)
 
-    # man page
-    PATH="${
-      python3Packages.python.withPackages (
-        ps: with ps; [
-          sphinx
-          sphinxcontrib-newsfeed
-        ]
-      )
-    }/bin:$PATH" \
-      make -C doc man
-    installManPage doc/build/man/khal.1
-
     # .desktop file
     install -Dm755 misc/khal.desktop -t $out/share/applications
   '';
diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix
index ce07ac8efaf5..d753afe7a57b 100644
--- a/pkgs/by-name/ko/komikku/package.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.79.1";
+  version = "1.80.0";
   pyproject = false;
 
   src = fetchFromGitea {
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     tag = "v${version}";
-    hash = "sha256-e3PRnltdYmHwGjjLgQfKXr+A+7spcRj4TzKIdNoMudM=";
+    hash = "sha256-5+AosFjxaqhIoIz+mbin1oRdjuGj+p117aoHLxYqHDA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix
index a280a0251edc..04525c148423 100644
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "komodo";
-  version = "1.17.5";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     owner = "moghtech";
     repo = "komodo";
     tag = "v${version}";
-    hash = "sha256-vIK/4WH85qTdjXBX32F6P/XEHdsNw2Kd86btjfl13lE=";
+    hash = "sha256-OBap1gKxFUh1QoR5waXi2IrWiTydhp/VtL9rGnEDJSI=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-YCSxMcuzN1IroDfbj18yjGT0ua1xfY4l0dJ/OZhHPZw=";
+  cargoHash = "sha256-P7s+uEnh8CUmRLiBLz/yNbox8auHU5zFk8IiWGW0rAs=";
 
   # disable for check. document generation is fail
   # > error: doctest failed, to rerun pass `-p komodo_client --doc`
diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix
index 9d136dc46cb9..75d84d71f453 100644
--- a/pkgs/by-name/kt/ktls-utils/package.nix
+++ b/pkgs/by-name/kt/ktls-utils/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ktls-utils";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "ktls-utils";
     rev = "ktls-utils-${version}";
-    hash = "sha256-dIzff/NL/M3yHvxCmDELmDfCtO3UpxXWNGq+VeCH5Z0=";
+    hash = "sha256-UQMM4P2YZbdB8H+kTLPBKLces0HJHAO3f21VvI1yNmk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index cdc603164520..07a3e3728cf8 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "52.7.0";
+  version = "52.7.7";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = "v${version}";
-    hash = "sha256-D3mHLYN6OVk7f1MCCWqSg/3qeg83EHcpqvkm1UTOaaM=";
+    hash = "sha256-gF1Q0amsgKyog+98zeHMidU8vzlTynr69alC6BhGAqI=";
   };
 
   vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";
diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix
index 85d03960c28a..fb54bf98751e 100644
--- a/pkgs/by-name/ku/kubevirt/package.nix
+++ b/pkgs/by-name/ku/kubevirt/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "kubevirt";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "kubevirt";
     repo = "kubevirt";
     rev = "v${version}";
-    hash = "sha256-wREuRKfpyAL1SF1tnSNqCLqvWctVHHEpyrWLIY0nV3Y=";
+    hash = "sha256-R01kW6mS1Ce3oi3p6RFVXif/BybM9HlbL2WT9b5wJuE=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
index da3760f9e31a..cfda121f6d56 100644
--- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc-tweaks-gtk";
-  version = "0-unstable-2025-04-01";
+  version = "0-unstable-2025-06-14";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc-tweaks-gtk";
-    rev = "b1779b293f1d0b07b328a6cbbfb5b1c4e3529d97";
-    hash = "sha256-K2f1ztuhi3+btc41/1FYVvTBnPEVM5XQmlJxW7y9MlY=";
+    rev = "394a61ed5a546c59d4e632a5a7b184aecc79166a";
+    hash = "sha256-/iYe3FVIFo74XnyWeUHpWjmLCw8MsZBqXp55o0FjILA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 7c054e74e004..882377298dd8 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -2,13 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   cacert,
   unicode-emoji,
   unicode-character-database,
   unicode-idna,
   publicsuffix-list,
   cmake,
+  copyDesktopItems,
+  makeDesktopItem,
   ninja,
   pkg-config,
   curl,
@@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    copyDesktopItems
     ninja
     pkg-config
     python3
@@ -141,10 +143,41 @@ stdenv.mkDerivation (finalAttrs: {
   # https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434
   env.NIX_LDFLAGS = "-lGL -lfontconfig";
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/Applications $out/bin
-    mv $out/bundle/Ladybird.app $out/Applications
-  '';
+  postInstall =
+    ''
+      for size in 48x48 128x128; do
+        mkdir -p $out/share/icons/hicolor/$size/apps
+        ln -s $out/share/Lagom/icons/$size/app-browser.png \
+          $out/share/icons/hicolor/$size/apps/ladybird.png
+      done
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir -p $out/Applications $out/bin
+      mv $out/bundle/Ladybird.app $out/Applications
+    '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "ladybird";
+      desktopName = "Ladybird";
+      exec = "Ladybird -- %U";
+      icon = "ladybird";
+      categories = [
+        "Network"
+        "WebBrowser"
+      ];
+      mimeTypes = [
+        "text/html"
+        "application/xhtml+xml"
+        "x-scheme-handler/http"
+        "x-scheme-handler/https"
+      ];
+      actions.new-window = {
+        name = "New Window";
+        exec = "Ladybird --new-window -- %U";
+      };
+    })
+  ];
 
   # Only Ladybird and WebContent need wrapped, if Qt is enabled.
   # On linux we end up wraping some non-Qt apps, like headless-browser.
diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix
index 860f812c5272..bd0ee29a3d71 100644
--- a/pkgs/by-name/la/lammps/package.nix
+++ b/pkgs/by-name/la/lammps/package.nix
@@ -49,14 +49,14 @@
 stdenv.mkDerivation (finalAttrs: {
   # LAMMPS has weird versioning convention. Updates should go smoothly with:
   # nix-update --commit lammps --version-regex 'stable_(.*)'
-  version = "29Aug2024_update2";
+  version = "29Aug2024_update3";
   pname = "lammps";
 
   src = fetchFromGitHub {
     owner = "lammps";
     repo = "lammps";
     rev = "stable_${finalAttrs.version}";
-    hash = "sha256-xhFLsK3CQFIfajdwkpz593KTUGwcIWX1bLIPClDe/V8=";
+    hash = "sha256-nvUkRkO58Hmrsieyd9ALRUA7Q80AcZffW85ipH4NF/U=";
   };
   preConfigure = ''
     cd cmake
diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix
index a472ceff3136..185dd2f0b869 100644
--- a/pkgs/by-name/lg/lgpio/package.nix
+++ b/pkgs/by-name/lg/lgpio/package.nix
@@ -6,7 +6,14 @@
   # If we build the python packages, these two are not null
   buildPythonPackage ? null,
   lgpioWithoutPython ? null,
-  # When building a python Packages, this specifies the python subproject
+  # When building a python Packages, this specifies the python subproject - a
+  # folder in the repository. The current options are:
+  #
+  # - <empty>
+  # - PY_LGPIO
+  # - PY_RGPIO
+  #
+  # Where an empty value means 'build the non python project'.
   pyProject ? "",
 }:
 
@@ -28,30 +35,18 @@ mkDerivation rec {
     swig
   ];
 
-  preConfigure =
-    if pyProject != "" then
-      ''
-        cd ${pyProject}
-      ''
-    else
-      "";
+  preConfigure = lib.optionalString (pyProject != "") ''
+    cd ${pyProject}
+  '';
   # Emulate ldconfig when building the C API
-  postConfigure =
-    if pyProject == "" then
-      ''
-        substituteInPlace Makefile \
-          --replace ldconfig 'echo ldconfig'
-      ''
-    else
-      "";
+  postConfigure = lib.optionalString (pyProject == "") ''
+    substituteInPlace Makefile \
+      --replace ldconfig 'echo ldconfig'
+  '';
 
-  preBuild =
-    if pyProject == "PY_LGPIO" then
-      ''
-        swig -python lgpio.i
-      ''
-    else
-      "";
+  preBuild = lib.optionalString (pyProject == "PY_LGPIO") ''
+    swig -python lgpio.i
+  '';
 
   buildInputs = [
     lgpioWithoutPython
@@ -64,7 +59,7 @@ mkDerivation rec {
   meta = {
     description = "Linux C libraries and Python modules for manipulating GPIO";
     homepage = "https://github.com/joan2937/lg";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ doronbehar ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/li/liblockfile/package.nix b/pkgs/by-name/li/liblockfile/package.nix
index 7d1d1b576933..50e3b308e016 100644
--- a/pkgs/by-name/li/liblockfile/package.nix
+++ b/pkgs/by-name/li/liblockfile/package.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     mainProgram = "dotlockfile";
     homepage = "http://packages.debian.org/unstable/libs/liblockfile1";
     license = lib.licenses.gpl2Plus;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libzdb/package.nix b/pkgs/by-name/li/libzdb/package.nix
index 212515cc49c6..7cfa3c4a47b0 100644
--- a/pkgs/by-name/li/libzdb/package.nix
+++ b/pkgs/by-name/li/libzdb/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.4.0";
+  version = "3.4.1";
   pname = "libzdb";
 
   src = fetchurl {
     url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
-    sha256 = "sha256-q9Z1cZvL3eQwqk7hOXW5gNVdKry1zCKAgqMDIKa7nw8=";
+    sha256 = "sha256-W0Yz/CoWiA93YZf0BF9i7421Bi9jAw+iIQEdS4XXNss=";
   };
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/by-name/lo/lockfileProgs/package.nix b/pkgs/by-name/lo/lockfileProgs/package.nix
index 10605e8c6703..1040d43fc0e1 100644
--- a/pkgs/by-name/lo/lockfileProgs/package.nix
+++ b/pkgs/by-name/lo/lockfileProgs/package.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
     description = "Programs for locking and unlocking files and mailboxes";
     homepage = "http://packages.debian.org/sid/lockfile-progs";
     license = lib.licenses.gpl2Only;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/lo/logcheck/package.nix b/pkgs/by-name/lo/logcheck/package.nix
index 83c54e62f1c6..26e6d87115a7 100644
--- a/pkgs/by-name/lo/logcheck/package.nix
+++ b/pkgs/by-name/lo/logcheck/package.nix
@@ -49,6 +49,5 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://salsa.debian.org/debian/logcheck";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.bluescreen303 ];
   };
 }
diff --git a/pkgs/by-name/lo/lokinet/package.nix b/pkgs/by-name/lo/lokinet/package.nix
index e9a143f3c6d1..71814f6431be 100644
--- a/pkgs/by-name/lo/lokinet/package.nix
+++ b/pkgs/by-name/lo/lokinet/package.nix
@@ -26,14 +26,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "lokinet";
-  version = "0.9.11";
+  version = "0.9.13";
 
   src = fetchFromGitHub {
     owner = "oxen-io";
     repo = "lokinet";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-aVFLDGTbRUOw2XWDpl+ojwHBG7c0miGeoKMLwMpqVtg=";
+    hash = "sha256-6TVMuT4O8zJj97873BTsR1PJU8NaBgYr/nBkc/EfQuQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix
index 71ec2cc03056..50fdb7273515 100644
--- a/pkgs/by-name/ma/mark/package.nix
+++ b/pkgs/by-name/ma/mark/package.nix
@@ -1,23 +1,23 @@
 {
   lib,
-  buildGo123Module,
+  buildGoModule,
   fetchFromGitHub,
 }:
 
 # Tests with go 1.24 do not work. For now
 # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996
-buildGo123Module rec {
+buildGoModule rec {
   pname = "mark";
-  version = "12.2.0";
+  version = "14.0.4";
 
   src = fetchFromGitHub {
     owner = "kovetskiy";
     repo = "mark";
     rev = "${version}";
-    sha256 = "sha256-0w6rIOSnOS7EfTBA/mRNWm8KOtdviTxWdukl4reb4zE=";
+    sha256 = "sha256-o5y1rybj32IrlSPMIw1Jv+Os/fdrQSjeUgvGvFvYS3A=";
   };
 
-  vendorHash = "sha256-CqFCjSXw7/jLe1OYosUl6mKSPEsdHl8p3zb/LVNqnxM=";
+  vendorHash = "sha256-ClSFazL9+prDgqHGK5ihSIqCWp8IDtyQ5dpKECfUp6A=";
 
   ldflags = [
     "-s"
@@ -30,6 +30,7 @@ buildGo123Module rec {
       skippedTests = [
         # Expects to be able to launch google-chrome
         "TestExtractMermaidImage"
+        "TestExtractD2Image/example"
       ];
     in
     [
@@ -41,6 +42,9 @@ buildGo123Module rec {
     mainProgram = "mark";
     homepage = "https://github.com/kovetskiy/mark";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rguevara84 ];
+    maintainers = with maintainers; [
+      rguevara84
+      wrbbz
+    ];
   };
 }
diff --git a/pkgs/by-name/me/mermaid-cli/integrity.patch b/pkgs/by-name/me/mermaid-cli/integrity.patch
deleted file mode 100644
index 7d0e8a09ebee..000000000000
--- a/pkgs/by-name/me/mermaid-cli/integrity.patch
+++ /dev/null
@@ -1,931 +0,0 @@
-Subject: [PATCH] build: add missing package integrity
----
-Index: package-lock.json
-<+>UTF-8
-===================================================================
-diff --git a/package-lock.json b/package-lock.json
---- a/package-lock.json	(revision f1f9df1a2a87f2649f9c2d6add5cb5d2714e70a8)
-+++ b/package-lock.json	(revision fa593dc39619f44b57a922927a66346248f31d7d)
-@@ -319,6 +319,7 @@
-     "node_modules/@babel/helper-function-name/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -331,6 +332,7 @@
-     "node_modules/@babel/helper-function-name/node_modules/chalk": {
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -345,6 +347,7 @@
-     "node_modules/@babel/helper-function-name/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -354,12 +357,14 @@
-     "node_modules/@babel/helper-function-name/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==",
-       "dev": true,
-       "license": "MIT"
-     },
-     "node_modules/@babel/helper-function-name/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -369,6 +374,7 @@
-     "node_modules/@babel/helper-function-name/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -378,6 +384,7 @@
-     "node_modules/@babel/helper-function-name/node_modules/supports-color": {
-       "version": "5.5.0",
-       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -597,6 +604,7 @@
-     "node_modules/@babel/highlight/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -609,6 +617,7 @@
-     "node_modules/@babel/highlight/node_modules/chalk": {
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -623,6 +632,7 @@
-     "node_modules/@babel/highlight/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -632,12 +642,14 @@
-     "node_modules/@babel/highlight/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==",
-       "dev": true,
-       "license": "MIT"
-     },
-     "node_modules/@babel/highlight/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -647,6 +659,7 @@
-     "node_modules/@babel/highlight/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -656,6 +669,7 @@
-     "node_modules/@babel/highlight/node_modules/supports-color": {
-       "version": "5.5.0",
-       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -1053,6 +1067,7 @@
-     "node_modules/@babel/traverse/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -1065,6 +1080,7 @@
-     "node_modules/@babel/traverse/node_modules/chalk": {
-       "version": "2.4.2",
-       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -1079,6 +1095,7 @@
-     "node_modules/@babel/traverse/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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -1088,12 +1105,14 @@
-     "node_modules/@babel/traverse/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==",
-       "dev": true,
-       "license": "MIT"
-     },
-     "node_modules/@babel/traverse/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -1113,6 +1132,7 @@
-     "node_modules/@babel/traverse/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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -1122,6 +1142,7 @@
-     "node_modules/@babel/traverse/node_modules/supports-color": {
-       "version": "5.5.0",
-       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -1935,6 +1956,7 @@
-     "node_modules/@jest/console/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": {
-@@ -1999,6 +2021,7 @@
-     "node_modules/@jest/core/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": {
-@@ -2164,6 +2187,7 @@
-     "node_modules/@jest/reporters/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": {
-@@ -2323,6 +2347,7 @@
-     "node_modules/@jest/transform/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": {
-@@ -2364,6 +2389,7 @@
-     "node_modules/@jest/types/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": {
-@@ -3207,6 +3233,7 @@
-     "node_modules/@types/json5": {
-       "version": "0.0.29",
-       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-       "dev": true,
-       "license": "MIT"
-     },
-@@ -3491,6 +3518,7 @@
-     "node_modules/ajv": {
-       "version": "6.12.6",
-       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -3824,6 +3852,7 @@
-     "node_modules/babel-jest/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": {
-@@ -4177,6 +4206,7 @@
-     "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": {
-@@ -4375,6 +4405,7 @@
-     "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": {
-@@ -4394,6 +4425,7 @@
-     "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": {
-@@ -4515,6 +4547,7 @@
-     "node_modules/create-jest/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": {
-@@ -4531,6 +4564,7 @@
-     "node_modules/cross-spawn": {
-       "version": "7.0.3",
-       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -5185,6 +5219,7 @@
-     "node_modules/deep-is": {
-       "version": "0.1.3",
-       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-+      "integrity": "sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==",
-       "dev": true,
-       "license": "MIT"
-     },
-@@ -5300,6 +5335,7 @@
-     "node_modules/doctrine": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-       "dev": true,
-       "license": "Apache-2.0",
-       "dependencies": {
-@@ -5381,6 +5417,7 @@
-     "node_modules/error-ex": {
-       "version": "1.3.2",
-       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -5567,6 +5604,7 @@
-     "node_modules/es-to-primitive": {
-       "version": "1.2.1",
-       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -5851,6 +5889,7 @@
-     "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-       "version": "2.1.0",
-       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -5866,6 +5905,7 @@
-     "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-       "version": "1.3.0",
-       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-       "dev": true,
-       "license": "Apache-2.0",
-       "engines": {
-@@ -6067,6 +6107,7 @@
-     "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-+      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-       "dev": true,
-       "license": "Apache-2.0",
-       "engines": {
-@@ -6089,6 +6130,7 @@
-     "node_modules/eslint/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": {
-@@ -6105,6 +6147,7 @@
-     "node_modules/eslint/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": {
-@@ -6237,6 +6280,7 @@
-     "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": {
-@@ -6249,6 +6293,7 @@
-     "node_modules/estraverse": {
-       "version": "5.2.0",
-       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-       "dev": true,
-       "license": "BSD-2-Clause",
-       "engines": {
-@@ -6264,6 +6309,7 @@
-     "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": {
-@@ -6375,6 +6421,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT"
-     },
-@@ -6404,12 +6451,14 @@
-     "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==",
-       "dev": 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"
-     },
-@@ -6485,6 +6534,7 @@
-     "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": {
-@@ -6544,6 +6594,7 @@
-     "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"
-     },
-     "node_modules/fsevents": {
-@@ -6812,6 +6863,7 @@
-     "node_modules/has": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -6834,6 +6886,7 @@
-     "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": {
-@@ -7012,6 +7065,7 @@
-     "node_modules/import-fresh": {
-       "version": "3.2.1",
-       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-+      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -7055,6 +7109,7 @@
-     "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": {
-@@ -7064,6 +7119,7 @@
-     "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==",
-       "license": "ISC",
-       "dependencies": {
-         "once": "^1.3.0",
-@@ -7073,6 +7129,7 @@
-     "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/internal-slot": {
-@@ -7133,6 +7190,7 @@
-     "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"
-     },
-@@ -7197,6 +7255,7 @@
-     "node_modules/is-callable": {
-       "version": "1.2.2",
-       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -7446,6 +7505,7 @@
-     "node_modules/is-string": {
-       "version": "1.0.5",
-       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -7458,6 +7518,7 @@
-     "node_modules/is-symbol": {
-       "version": "1.0.3",
-       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-+      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -7539,6 +7600,7 @@
-     "node_modules/isexe": {
-       "version": "2.0.0",
-       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-       "dev": true,
-       "license": "ISC"
-     },
-@@ -7720,6 +7782,7 @@
-     "node_modules/jest-circus/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": {
-@@ -7770,6 +7833,7 @@
-     "node_modules/jest-cli/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": {
-@@ -7832,6 +7896,7 @@
-     "node_modules/jest-config/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": {
-@@ -7864,6 +7929,7 @@
-     "node_modules/jest-diff/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": {
-@@ -7910,6 +7976,7 @@
-     "node_modules/jest-each/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": {
-@@ -8010,6 +8077,7 @@
-     "node_modules/jest-matcher-utils/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": {
-@@ -8047,6 +8115,7 @@
-     "node_modules/jest-message-util/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": {
-@@ -8141,6 +8210,7 @@
-     "node_modules/jest-resolve/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": {
-@@ -8190,6 +8260,7 @@
-     "node_modules/jest-runner/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": {
-@@ -8240,6 +8311,7 @@
-     "node_modules/jest-runtime/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": {
-@@ -8298,6 +8370,7 @@
-     "node_modules/jest-snapshot/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": {
-@@ -8348,6 +8421,7 @@
-     "node_modules/jest-util/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": {
-@@ -8382,6 +8456,7 @@
-     "node_modules/jest-validate/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": {
-@@ -8418,6 +8493,7 @@
-     "node_modules/jest-watcher/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": {
-@@ -8478,6 +8554,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT"
-     },
-@@ -8531,12 +8608,14 @@
-     "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==",
-       "dev": 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"
-     },
-@@ -8569,6 +8648,7 @@
-     "node_modules/jsx-ast-utils": {
-       "version": "3.1.0",
-       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz",
-+      "integrity": "sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -8660,6 +8740,7 @@
-     "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": {
-@@ -8745,6 +8826,7 @@
-     "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": {
-@@ -8757,6 +8839,7 @@
-     "node_modules/lodash": {
-       "version": "4.17.21",
-       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-       "license": "MIT"
-     },
-     "node_modules/lodash-es": {
-@@ -8775,6 +8858,7 @@
-     "node_modules/loose-envify": {
-       "version": "1.4.0",
-       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -8993,6 +9077,7 @@
-     "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"
-     },
-@@ -9045,6 +9130,7 @@
-     "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"
-@@ -9075,6 +9161,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -9161,6 +9248,7 @@
-     "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"
-@@ -9185,6 +9273,7 @@
-     "node_modules/optionator": {
-       "version": "0.9.1",
-       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -9218,6 +9307,7 @@
-     "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": {
-@@ -9230,6 +9320,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -9245,6 +9336,7 @@
-     "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": {
-@@ -9294,6 +9386,7 @@
-     "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": {
-@@ -9331,6 +9424,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -9340,6 +9434,7 @@
-     "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",
-       "engines": {
-         "node": ">=0.10.0"
-@@ -9348,6 +9443,7 @@
-     "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": {
-@@ -9357,6 +9453,7 @@
-     "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/pathe": {
-@@ -9531,6 +9628,7 @@
-     "node_modules/pkg-dir": {
-       "version": "4.2.0",
-       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -9711,6 +9809,7 @@
-     "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": {
-@@ -9854,6 +9953,7 @@
-     "node_modules/punycode": {
-       "version": "2.1.1",
-       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -10090,6 +10190,7 @@
-     "node_modules/regexpp": {
-       "version": "3.1.0",
-       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -10152,6 +10253,7 @@
-     "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": {
-@@ -10181,6 +10283,7 @@
-     "node_modules/rimraf": {
-       "version": "3.0.2",
-       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-       "dev": true,
-       "license": "ISC",
-       "dependencies": {
-@@ -10275,6 +10378,7 @@
-     "node_modules/rw": {
-       "version": "1.3.3",
-       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-+      "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==",
-       "license": "BSD-3-Clause"
-     },
-     "node_modules/safe-array-concat": {
-@@ -10299,6 +10403,7 @@
-     "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"
-     },
-@@ -10332,6 +10437,7 @@
-     "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/semver": {
-@@ -10381,6 +10487,7 @@
-     "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": {
-@@ -10393,6 +10500,7 @@
-     "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": {
-@@ -10823,6 +10931,7 @@
-     "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==",
-       "dev": true,
-       "license": "MIT",
-       "engines": {
-@@ -10842,6 +10951,7 @@
-     "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": {
-@@ -11053,6 +11163,7 @@
-     "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"
-     },
-@@ -11172,6 +11283,7 @@
-     "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": {
-@@ -11355,6 +11467,7 @@
-     "node_modules/uri-js": {
-       "version": "4.2.2",
-       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-       "dev": true,
-       "license": "BSD-2-Clause",
-       "dependencies": {
-@@ -11371,6 +11484,7 @@
-     "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": {
-@@ -11643,6 +11757,7 @@
-     "node_modules/which": {
-       "version": "2.0.2",
-       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-       "dev": true,
-       "license": "ISC",
-       "dependencies": {
-@@ -11785,6 +11900,7 @@
-     "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/write-file-atomic": {
diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix
index 058bf0dcde6d..a9b6495f47f3 100644
--- a/pkgs/by-name/me/mermaid-cli/package.nix
+++ b/pkgs/by-name/me/mermaid-cli/package.nix
@@ -4,9 +4,10 @@
   stdenv,
   fetchFromGitHub,
   chromium,
+  nix-update-script,
 }:
 let
-  version = "11.4.2";
+  version = "11.4.3";
 in
 buildNpmPackage {
   pname = "mermaid-cli";
@@ -16,15 +17,14 @@ buildNpmPackage {
     owner = "mermaid-js";
     repo = "mermaid-cli";
     rev = version;
-    hash = "sha256-hj6pnucms6OcLuIebnlHMQj2K8zMbyuWzvVkZh029Sw=";
+    hash = "sha256-vf6FwQlgSvbOL+areHrAI0MnsfXg/7lC6PZTyFfOE78=";
   };
 
   patches = [
-    ./integrity.patch # https://github.com/mermaid-js/mermaid-cli/issues/828
     ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830
   ];
 
-  npmDepsHash = "sha256-lrj3lSCfqUfUFvtnJ/ELNUFE9kNTC4apnGrYxYmkUtE=";
+  npmDepsHash = "sha256-+X3WJalbcCt1dClp8DcbvtfdYS4DFxZW6TgQMddLXFc=";
 
   env = {
     PUPPETEER_SKIP_DOWNLOAD = true;
@@ -34,6 +34,10 @@ buildNpmPackage {
 
   makeWrapperArgs = lib.lists.optional (lib.meta.availableOn stdenv.hostPlatform chromium) "--set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}'";
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Generation of diagrams from text in a similar manner as markdown";
     homepage = "https://github.com/mermaid-js/mermaid-cli";
diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index 87bb340bbbec..9b3a1a624432 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mydumper";
-  version = "0.18.1-1";
+  version = "0.19.3-1";
 
   src = fetchFromGitHub {
     owner = "mydumper";
     repo = "mydumper";
     tag = "v${version}";
-    hash = "sha256-7CnNcaZ2jLlLx211DA5Zk3uf724yCMpt/0zgjvZl3fM=";
+    hash = "sha256-96AFq6wEALRRqD6+n/XMOAus3v9GX/eZOVZQdgUtf+w=";
     # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule
     fetchSubmodules = true;
   };
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = (
     if stdenv.hostPlatform.isDarwin then
       toString [
-        "-Wno-error=deprecated-non-prototype"
         "-Wno-error=format"
+        "-Wno-error=sometimes-uninitialized"
       ]
     else
       "-Wno-error=maybe-uninitialized"
diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix
index 0c4accbe548a..456a53f6129d 100644
--- a/pkgs/by-name/na/nano/package.nix
+++ b/pkgs/by-name/na/nano/package.nix
@@ -64,6 +64,10 @@ stdenv.mkDerivation rec {
         cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
       '';
 
+  # https://hydra.nixos.org/build/300187289/nixlog/1
+  # openat-die.c:57:10: error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security]
+  hardeningDisable = [ "format" ];
+
   enableParallelBuilding = true;
   strictDeps = true;
 
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index e430e5a18a76..cfcfcb423ce6 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird";
-  version = "0.46.0";
+  version = "0.47.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-31aTyk9mwjN8xvxS3TLXt2ss+nyO8oP29lc4Zej/wEs=";
+    hash = "sha256-q9+yIq+FNcsZbmJjUjUxOEZn5jvfGfAE6Yt6Cc67rrg=";
   };
 
-  vendorHash = "sha256-g4O0r+zJPiKAj3d+juYkGYPDh3I9aMF/kFjsguhOqIQ=";
+  vendorHash = "sha256-t/X/muMwHVwg8Or+pFTSEQEsnkKLuApoVUmMhyCImWI=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 
diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix
index 0e1ec9ed8b32..5b4188958dcf 100644
--- a/pkgs/by-name/ne/nexttrace/package.nix
+++ b/pkgs/by-name/ne/nexttrace/package.nix
@@ -2,7 +2,6 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  stdenv,
 }:
 
 buildGoModule rec {
@@ -23,6 +22,7 @@ buildGoModule rec {
     "-s"
     "-w"
     "-X github.com/nxtrace/NTrace-core/config.Version=v${version}"
+    "-checklinkname=0" # refers to https://github.com/nxtrace/NTrace-core/issues/247
   ];
 
   postInstall = ''
@@ -35,8 +35,5 @@ buildGoModule rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ sharzy ];
     mainProgram = "nexttrace";
-    # Broken on darwin for Go toolchain > 1.22, with error:
-    # 'link: github.com/nxtrace/NTrace-core/trace/internal: invalid reference to net.internetSocket'
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
index 1fe63e47f65c..b48defe8edb3 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -100,23 +100,23 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.26.2",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+            "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.27.1",
                 "js-tokens": "^4.0.0",
-                "picocolors": "^1.0.0"
+                "picocolors": "^1.1.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+            "version": "7.27.5",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.5.tgz",
+            "integrity": "sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -124,22 +124,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.26.10",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
-            "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
+            "version": "7.27.4",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.4.tgz",
+            "integrity": "sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.10",
-                "@babel/helper-compilation-targets": "^7.26.5",
-                "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.10",
-                "@babel/parser": "^7.26.10",
-                "@babel/template": "^7.26.9",
-                "@babel/traverse": "^7.26.10",
-                "@babel/types": "^7.26.10",
+                "@babel/code-frame": "^7.27.1",
+                "@babel/generator": "^7.27.3",
+                "@babel/helper-compilation-targets": "^7.27.2",
+                "@babel/helper-module-transforms": "^7.27.3",
+                "@babel/helpers": "^7.27.4",
+                "@babel/parser": "^7.27.4",
+                "@babel/template": "^7.27.2",
+                "@babel/traverse": "^7.27.4",
+                "@babel/types": "^7.27.3",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -155,13 +155,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-            "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+            "version": "7.27.5",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.5.tgz",
+            "integrity": "sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0",
+                "@babel/parser": "^7.27.5",
+                "@babel/types": "^7.27.3",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^3.0.2"
@@ -171,14 +171,14 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
-            "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+            "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.26.8",
-                "@babel/helper-validator-option": "^7.25.9",
+                "@babel/compat-data": "^7.27.2",
+                "@babel/helper-validator-option": "^7.27.1",
                 "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
@@ -188,29 +188,29 @@
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+            "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/traverse": "^7.25.9",
-                "@babel/types": "^7.25.9"
+                "@babel/traverse": "^7.27.1",
+                "@babel/types": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+            "version": "7.27.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+            "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-module-imports": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
+                "@babel/helper-module-imports": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.27.1",
+                "@babel/traverse": "^7.27.3"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -220,9 +220,9 @@
             }
         },
         "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-            "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+            "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -230,27 +230,27 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+            "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"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+            "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+            "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -258,26 +258,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
-            "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
+            "version": "7.27.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",
+            "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/template": "^7.27.2",
+                "@babel/types": "^7.27.6"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
-            "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+            "version": "7.27.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.5.tgz",
+            "integrity": "sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.27.0"
+                "@babel/types": "^7.27.3"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -287,13 +287,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-react-jsx-self": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz",
-            "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.27.1.tgz",
+            "integrity": "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -303,13 +303,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-react-jsx-source": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz",
-            "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.27.1.tgz",
+            "integrity": "sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -319,42 +319,39 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
-            "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+            "version": "7.27.6",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
+            "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
             "license": "MIT",
-            "dependencies": {
-                "regenerator-runtime": "^0.14.0"
-            },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-            "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+            "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/code-frame": "^7.27.1",
+                "@babel/parser": "^7.27.2",
+                "@babel/types": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-            "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+            "version": "7.27.4",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.4.tgz",
+            "integrity": "sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==",
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.27.0",
-                "@babel/parser": "^7.27.0",
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0",
+                "@babel/code-frame": "^7.27.1",
+                "@babel/generator": "^7.27.3",
+                "@babel/parser": "^7.27.4",
+                "@babel/template": "^7.27.2",
+                "@babel/types": "^7.27.3",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -372,28 +369,28 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
-            "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+            "version": "7.27.6",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",
+            "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==",
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9"
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@biomejs/js-api": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.7.1.tgz",
-            "integrity": "sha512-VFdgFFZWcyCQxZcAasyv8Enpexn4CblMdWmr6izLYHTLcbd+z9x/LuKU71qnmClABfnYqZjiY7c8DKTVri3Ajw==",
+            "version": "0.8.0-beta.3",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-0.8.0-beta.3.tgz",
+            "integrity": "sha512-Rlljal9Wwdt2OgOnTUdlvzUEVKNzTCeEPekXTjQT6uwZE21akpviljo5u3HNPkW55Sh8zqHDZ/3d9gI4yoEv2A==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
-                "@biomejs/wasm-bundler": "^1.9.2",
-                "@biomejs/wasm-nodejs": "^1.9.2",
-                "@biomejs/wasm-web": "^1.9.2"
+                "@biomejs/wasm-bundler": "^1.9.4",
+                "@biomejs/wasm-nodejs": "^1.9.4",
+                "@biomejs/wasm-web": "^1.9.4"
             },
             "peerDependenciesMeta": {
                 "@biomejs/wasm-bundler": {
@@ -412,12 +409,14 @@
             "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-1.9.4.tgz",
             "integrity": "sha512-ZqNlhKcZW6MW1LxWIOfh9YVrBykvzyFad3bOh6JJFraDnNa3NXboRDiaI8dmrbb0ZHXCU1Tsq6WQsKV2Vpp5dw==",
             "dev": true,
-            "license": "MIT OR Apache-2.0"
+            "license": "MIT OR Apache-2.0",
+            "optional": true,
+            "peer": true
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
-            "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
+            "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
             "cpu": [
                 "ppc64"
             ],
@@ -432,9 +431,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
-            "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
+            "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
             "cpu": [
                 "arm"
             ],
@@ -449,9 +448,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
-            "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
+            "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
             "cpu": [
                 "arm64"
             ],
@@ -466,9 +465,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
-            "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
+            "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
             "cpu": [
                 "x64"
             ],
@@ -483,9 +482,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
-            "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
+            "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
             "cpu": [
                 "arm64"
             ],
@@ -500,9 +499,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
-            "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
+            "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
             "cpu": [
                 "x64"
             ],
@@ -517,9 +516,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
+            "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
             "cpu": [
                 "arm64"
             ],
@@ -534,9 +533,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
-            "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
+            "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
             "cpu": [
                 "x64"
             ],
@@ -551,9 +550,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
-            "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
+            "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
             "cpu": [
                 "arm"
             ],
@@ -568,9 +567,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-            "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
+            "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
             "cpu": [
                 "arm64"
             ],
@@ -585,9 +584,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
-            "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
+            "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
             "cpu": [
                 "ia32"
             ],
@@ -602,9 +601,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
-            "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
+            "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
             "cpu": [
                 "loong64"
             ],
@@ -619,9 +618,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
-            "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
+            "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
             "cpu": [
                 "mips64el"
             ],
@@ -636,9 +635,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
-            "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
+            "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -653,9 +652,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
-            "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
+            "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
             "cpu": [
                 "riscv64"
             ],
@@ -670,9 +669,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
-            "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
+            "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
             "cpu": [
                 "s390x"
             ],
@@ -687,9 +686,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
-            "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
+            "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
             "cpu": [
                 "x64"
             ],
@@ -704,9 +703,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
+            "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
             "cpu": [
                 "arm64"
             ],
@@ -721,9 +720,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
+            "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
             "cpu": [
                 "x64"
             ],
@@ -738,9 +737,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
-            "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
+            "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
             "cpu": [
                 "arm64"
             ],
@@ -755,9 +754,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
-            "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
+            "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
             "cpu": [
                 "x64"
             ],
@@ -772,9 +771,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
-            "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
+            "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
             "cpu": [
                 "x64"
             ],
@@ -789,9 +788,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
-            "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
+            "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
             "cpu": [
                 "arm64"
             ],
@@ -806,9 +805,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
-            "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
+            "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
             "cpu": [
                 "ia32"
             ],
@@ -823,9 +822,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
-            "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
+            "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
             "cpu": [
                 "x64"
             ],
@@ -840,9 +839,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz",
-            "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+            "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -882,9 +881,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.20.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
-            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+            "version": "0.20.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
+            "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -897,9 +896,9 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.1.tgz",
-            "integrity": "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw==",
+            "version": "0.2.3",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
+            "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -907,9 +906,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
-            "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -957,13 +956,16 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.25.1",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.25.1.tgz",
-            "integrity": "sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==",
+            "version": "9.29.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
+            "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
             }
         },
         "node_modules/@eslint/object-schema": {
@@ -977,19 +979,32 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.8",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
-            "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
+            "version": "0.3.2",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.2.tgz",
+            "integrity": "sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.13.0",
+                "@eslint/core": "^0.15.0",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
+        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+            "version": "0.15.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
+            "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
         "node_modules/@exodus/schemasafe": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
@@ -998,28 +1013,28 @@
             "license": "MIT"
         },
         "node_modules/@floating-ui/core": {
-            "version": "1.6.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
-            "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+            "version": "1.7.1",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.1.tgz",
+            "integrity": "sha512-azI0DrjMMfIug/ExbBaeDVJXcY0a7EPvPjb2xAJPa4HeimBX+Z18HK8QQR3jb6356SnDDdxx+hinMLcJEDdOjw==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/utils": "^0.2.9"
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.6.13",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
-            "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+            "version": "1.7.1",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.1.tgz",
+            "integrity": "sha512-cwsmW/zyw5ltYTUeeYJ60CnQuPqmGwuGVhG9w0PRaRKkAyi38BT5CKrpIbb+jtahSwUl04cWzSx9ZOIxeS6RsQ==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/core": "^1.6.0",
+                "@floating-ui/core": "^1.7.1",
                 "@floating-ui/utils": "^0.2.9"
             }
         },
         "node_modules/@floating-ui/react-dom": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
-            "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.3.tgz",
+            "integrity": "sha512-huMBfiU9UnQ2oBwIhgzyIiSpVgvlDstU8CX0AF+wS+KzmYMs0J2a3GwuFHV1Lz+jlrQGeC1fF+Nv0QoumyV0bA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/dom": "^1.0.0"
@@ -1097,9 +1112,9 @@
             }
         },
         "node_modules/@humanwhocodes/retry": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-            "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+            "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -1233,17 +1248,17 @@
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-alert-dialog": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.10.tgz",
-            "integrity": "sha512-EJ+FGNgLiOw33YOipPZ4/fZC2x1zKELDBjdJJleYsM6kJCBp3lvAPuXeUoYEHXNvv9iWl5VRU3IT7d/f4A5C7g==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.14.tgz",
+            "integrity": "sha512-IOZfZ3nPvN6lXpJTBCunFQPRSvK8MDgSc1FB85xnIpUKOw9en0dJj8JmCAxV7BiZdtYlUpmrQjoTFkVYtdoWzQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dialog": "1.1.10",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-slot": "1.2.0"
+                "@radix-ui/react-dialog": "1.1.14",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1261,12 +1276,12 @@
             }
         },
         "node_modules/@radix-ui/react-arrow": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.4.tgz",
-            "integrity": "sha512-qz+fxrqgNxG0dYew5l7qR3c7wdgRu1XVUHGnGYX7rg5HM4p9SWaRmJwfgR3J0SgyUKayLmzQIun+N6rWRgiRKw==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz",
+            "integrity": "sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.0"
+                "@radix-ui/react-primitive": "2.1.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1284,15 +1299,15 @@
             }
         },
         "node_modules/@radix-ui/react-avatar": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.6.tgz",
-            "integrity": "sha512-YDduxvqNMHzTQWNqja7Z/XTyFc8UOP98/ePjJTFa1vqILPlTPcQaVa1YyQMiQl4SFQPA9Y/zj1dHBgMlE5G/ow==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.10.tgz",
+            "integrity": "sha512-V8piFfWapM5OmNCXTzVQY+E1rDa53zY+MQ4Y7356v4fFz6vqCyUtIz2rUD44ZEdwg78/jKmMJHj07+C/Z/rcog==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
-                "@radix-ui/react-use-is-hydrated": "0.0.0",
+                "@radix-ui/react-use-is-hydrated": "0.1.0",
                 "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
@@ -1311,16 +1326,16 @@
             }
         },
         "node_modules/@radix-ui/react-checkbox": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.2.2.tgz",
-            "integrity": "sha512-pMxzQLK+m/tkDRXJg7VUjRx6ozsBdzNLOV4vexfVBU57qT2Gvf4cw2gKKhOohJxjadQ+WcUXCKosTIxcZzi03A==",
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.2.tgz",
+            "integrity": "sha512-yd+dI56KZqawxKZrJ31eENUwqc1QSqg4OZ15rybGjF2ZNwMO+wCyHzAVLRp9qoYJf7kYy0YpZ2b0JCzJ42HZpA==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "@radix-ui/react-use-previous": "1.1.1",
                 "@radix-ui/react-use-size": "1.1.1"
@@ -1341,15 +1356,15 @@
             }
         },
         "node_modules/@radix-ui/react-collection": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.4.tgz",
-            "integrity": "sha512-cv4vSf7HttqXilDnAnvINd53OTl1/bjUYVZrkFnA7nwmY9Ob2POUy0WY0sfqBAe1s5FyKsyceQlqiEGPYNTadg==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz",
+            "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-slot": "1.2.0"
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1397,22 +1412,22 @@
             }
         },
         "node_modules/@radix-ui/react-dialog": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.10.tgz",
-            "integrity": "sha512-m6pZb0gEM5uHPSb+i2nKKGQi/HMSVjARMsLMWQfKDP+eJ6B+uqryHnXhpnohTWElw+vEcMk/o4wJODtdRKHwqg==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.14.tgz",
+            "integrity": "sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-dismissable-layer": "1.1.10",
                 "@radix-ui/react-focus-guards": "1.1.2",
-                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-portal": "1.1.6",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-portal": "1.1.9",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
@@ -1448,14 +1463,14 @@
             }
         },
         "node_modules/@radix-ui/react-dismissable-layer": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.7.tgz",
-            "integrity": "sha512-j5+WBUdhccJsmH5/H0K6RncjDtoALSEr6jbkaZu+bjw6hOPOhHycr6vEUujl+HBK8kjUfWcoCJXxP6e4lUlMZw==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.10.tgz",
+            "integrity": "sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-escape-keydown": "1.1.1"
             },
@@ -1475,17 +1490,17 @@
             }
         },
         "node_modules/@radix-ui/react-dropdown-menu": {
-            "version": "2.1.11",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.11.tgz",
-            "integrity": "sha512-wbPE3cFBfLl+S+LCxChWQGX0k14zUxgvep1HEnLhJ9mNhjyO3ETzRviAeKZ3XomT/iVRRZAWFsnFZ3N0wI8OmA==",
+            "version": "2.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.15.tgz",
+            "integrity": "sha512-mIBnOjgwo9AH3FyKaSWoSu/dYj6VdhJ7frEPiGTeXCdUFHjl9h3mFh2wwhEtINOmYXWhdpf1rY2minFsmaNgVQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-menu": "2.1.11",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-menu": "2.1.15",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
@@ -1519,13 +1534,13 @@
             }
         },
         "node_modules/@radix-ui/react-focus-scope": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.4.tgz",
-            "integrity": "sha512-r2annK27lIW5w9Ho5NyQgqs0MmgZSTIKXWpVCJaLC1q2kZrZkcqnmHkCHMEmv8XLvsLlurKMPT+kbKkRkm/xVA==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz",
+            "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1"
             },
             "peerDependencies": {
@@ -1562,12 +1577,12 @@
             }
         },
         "node_modules/@radix-ui/react-label": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.4.tgz",
-            "integrity": "sha512-wy3dqizZnZVV4ja0FNnUhIWNwWdoldXrneEyUcVtLYDAt8ovGS4ridtMAOGgXBBIfggL4BOveVWsjXDORdGEQg==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.7.tgz",
+            "integrity": "sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.0"
+                "@radix-ui/react-primitive": "2.1.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1585,26 +1600,26 @@
             }
         },
         "node_modules/@radix-ui/react-menu": {
-            "version": "2.1.11",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.11.tgz",
-            "integrity": "sha512-sbFI4Qaw02J0ogmR9tOMsSqsdrGNpUanlPYAqTE2JJafow8ecHtykg4fSTjNHBdDl4deiKMK+RhTEwyVhP7UDA==",
+            "version": "2.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.15.tgz",
+            "integrity": "sha512-tVlmA3Vb9n8SZSd+YSbuFR66l87Wiy4du+YE+0hzKQEANA+7cWKH1WgqcEX4pXqxUFQKrWQGHdvEfw00TjFiew==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
-                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-dismissable-layer": "1.1.10",
                 "@radix-ui/react-focus-guards": "1.1.2",
-                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.4",
-                "@radix-ui/react-portal": "1.1.6",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-roving-focus": "1.1.7",
-                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-portal": "1.1.9",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-roving-focus": "1.1.10",
+                "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
@@ -1625,25 +1640,25 @@
             }
         },
         "node_modules/@radix-ui/react-navigation-menu": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.9.tgz",
-            "integrity": "sha512-Z7lefjA5VAmEB5ZClxeHGWGQAqhGWgEc6u0MYviUmIVrgGCVLv5mv/jsfUY3tJWI71cVhpQ7dnf/Q6RtM3ylVA==",
+            "version": "1.2.13",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.13.tgz",
+            "integrity": "sha512-WG8wWfDiJlSF5hELjwfjSGOXcBR/ZMhBFCGYe8vERpC39CQYZeq1PQ2kaYHdye3V95d06H89KGMsVCIE4LWo3g==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
-                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-dismissable-layer": "1.1.10",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "@radix-ui/react-use-layout-effect": "1.1.1",
                 "@radix-ui/react-use-previous": "1.1.1",
-                "@radix-ui/react-visually-hidden": "1.2.0"
+                "@radix-ui/react-visually-hidden": "1.2.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1661,23 +1676,23 @@
             }
         },
         "node_modules/@radix-ui/react-popover": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.10.tgz",
-            "integrity": "sha512-IZN7b3sXqajiPsOzKuNJBSP9obF4MX5/5UhTgWNofw4r1H+eATWb0SyMlaxPD/kzA4vadFgy1s7Z1AEJ6WMyHQ==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.14.tgz",
+            "integrity": "sha512-ODz16+1iIbGUfFEfKx2HTPKizg2MN39uIOV8MXeHnmdd3i/N9Wt7vU46wbHsqA0xoaQyXVcs0KIlBdOA2Y95bw==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-dismissable-layer": "1.1.10",
                 "@radix-ui/react-focus-guards": "1.1.2",
-                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.4",
-                "@radix-ui/react-portal": "1.1.6",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-portal": "1.1.9",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
@@ -1698,16 +1713,16 @@
             }
         },
         "node_modules/@radix-ui/react-popper": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.4.tgz",
-            "integrity": "sha512-3p2Rgm/a1cK0r/UVkx5F/K9v/EplfjAeIFCGOPYPO4lZ0jtg4iSQXt/YGTSLWaf4x7NG6Z4+uKFcylcTZjeqDA==",
+            "version": "1.2.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.7.tgz",
+            "integrity": "sha512-IUFAccz1JyKcf/RjB552PlWwxjeCJB8/4KxT7EhBHOJM+mN7LdW+B3kacJXILm32xawcMMjb2i0cIZpo+f9kiQ==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/react-dom": "^2.0.0",
-                "@radix-ui/react-arrow": "1.1.4",
+                "@radix-ui/react-arrow": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-layout-effect": "1.1.1",
                 "@radix-ui/react-use-rect": "1.1.1",
@@ -1730,12 +1745,12 @@
             }
         },
         "node_modules/@radix-ui/react-portal": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.6.tgz",
-            "integrity": "sha512-XmsIl2z1n/TsYFLIdYam2rmFwf9OC/Sh2avkbmVMDuBZIe7hSpM0cYnWPAo7nHOVx8zTuwDZGByfcqLdnzp3Vw==",
+            "version": "1.1.9",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz",
+            "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-layout-effect": "1.1.1"
             },
             "peerDependencies": {
@@ -1754,9 +1769,9 @@
             }
         },
         "node_modules/@radix-ui/react-presence": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.3.tgz",
-            "integrity": "sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.4.tgz",
+            "integrity": "sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2",
@@ -1778,12 +1793,12 @@
             }
         },
         "node_modules/@radix-ui/react-primitive": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.0.tgz",
-            "integrity": "sha512-/J/FhLdK0zVcILOwt5g+dH4KnkonCtkVJsa2G6JmvbbtZfBEI1gMsO3QMjseL4F/SwfAMt1Vc/0XKYKq+xJ1sw==",
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+            "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-slot": "1.2.0"
+                "@radix-ui/react-slot": "1.2.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1801,18 +1816,18 @@
             }
         },
         "node_modules/@radix-ui/react-roving-focus": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.7.tgz",
-            "integrity": "sha512-C6oAg451/fQT3EGbWHbCQjYTtbyjNO1uzQgMzwyivcHT3GKNEmu1q3UuREhN+HzHAVtv3ivMVK08QlC+PkYw9Q==",
+            "version": "1.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.10.tgz",
+            "integrity": "sha512-dT9aOXUen9JSsxnMPv/0VqySQf5eDQ6LCk5Sw28kamz8wSOW2bJdlX2Bg5VUIIcV+6XlHpWTIuTPCf/UNIyq8Q==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
-                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
@@ -1832,9 +1847,9 @@
             }
         },
         "node_modules/@radix-ui/react-scroll-area": {
-            "version": "1.2.5",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.5.tgz",
-            "integrity": "sha512-VyLjxI8/gXYn+Wij1FLpXjZp6Z/uNklUFQQ75tOpJNESeNaZ2kCRfjiEDmHgWmLeUPeJGwrqbgRmcdFjtYEkMA==",
+            "version": "1.2.9",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.9.tgz",
+            "integrity": "sha512-YSjEfBXnhUELsO2VzjdtYYD4CfQjvao+lhhrX5XsHD7/cyUNzljF1FHEbgTPN7LH2MClfwRMIsYlqTYpKTTe2A==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
@@ -1842,8 +1857,8 @@
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-layout-effect": "1.1.1"
             },
@@ -1863,30 +1878,30 @@
             }
         },
         "node_modules/@radix-ui/react-select": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.2.tgz",
-            "integrity": "sha512-HjkVHtBkuq+r3zUAZ/CvNWUGKPfuicGDbgtZgiQuFmNcV5F+Tgy24ep2nsAW2nFgvhGPJVqeBZa6KyVN0EyrBA==",
+            "version": "2.2.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.5.tgz",
+            "integrity": "sha512-HnMTdXEVuuyzx63ME0ut4+sEMYW6oouHWNGUZc7ddvUWIcfCva/AMoqEW/3wnEllriMWBa0RHspCYnfCWJQYmA==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
                 "@radix-ui/primitive": "1.1.2",
-                "@radix-ui/react-collection": "1.1.4",
+                "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.7",
+                "@radix-ui/react-dismissable-layer": "1.1.10",
                 "@radix-ui/react-focus-guards": "1.1.2",
-                "@radix-ui/react-focus-scope": "1.1.4",
+                "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.4",
-                "@radix-ui/react-portal": "1.1.6",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-slot": "1.2.0",
+                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-portal": "1.1.9",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "@radix-ui/react-use-layout-effect": "1.1.1",
                 "@radix-ui/react-use-previous": "1.1.1",
-                "@radix-ui/react-visually-hidden": "1.2.0",
+                "@radix-ui/react-visually-hidden": "1.2.3",
                 "aria-hidden": "^1.2.4",
                 "react-remove-scroll": "^2.6.3"
             },
@@ -1906,12 +1921,12 @@
             }
         },
         "node_modules/@radix-ui/react-separator": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.4.tgz",
-            "integrity": "sha512-2fTm6PSiUm8YPq9W0E4reYuv01EE3aFSzt8edBiXqPHshF8N9+Kymt/k0/R+F3dkY5lQyB/zPtrP82phskLi7w==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.7.tgz",
+            "integrity": "sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.0"
+                "@radix-ui/react-primitive": "2.1.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1929,9 +1944,9 @@
             }
         },
         "node_modules/@radix-ui/react-slot": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.0.tgz",
-            "integrity": "sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==",
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+            "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2"
@@ -1947,18 +1962,18 @@
             }
         },
         "node_modules/@radix-ui/react-tabs": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.8.tgz",
-            "integrity": "sha512-4iUaN9SYtG+/E+hJ7jRks/Nv90f+uAsRHbLYA6BcA9EsR6GNWgsvtS4iwU2SP0tOZfDGAyqIT0yz7ckgohEIFA==",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.12.tgz",
+            "integrity": "sha512-GTVAlRVrQrSw3cEARM0nAx73ixrWDPNZAruETn3oHCNP6SbZ/hNxdxp+u7VkIEv3/sFoLq1PfcHrl7Pnp0CDpw==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-presence": "1.1.3",
-                "@radix-ui/react-primitive": "2.1.0",
-                "@radix-ui/react-roving-focus": "1.1.7",
+                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-roving-focus": "1.1.10",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
@@ -2047,12 +2062,12 @@
             }
         },
         "node_modules/@radix-ui/react-use-is-hydrated": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.0.0.tgz",
-            "integrity": "sha512-23RkSm7jSZ8+rtfdSJTi/2D+p9soPbtnoG/tPf08egYCDr6p8X83hrcmW77p7MJ8kJYWNXwruuPTPp1TwIIH4g==",
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.0.tgz",
+            "integrity": "sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==",
             "license": "MIT",
             "dependencies": {
-                "use-sync-external-store": "^1.4.0"
+                "use-sync-external-store": "^1.5.0"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2131,12 +2146,12 @@
             }
         },
         "node_modules/@radix-ui/react-visually-hidden": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.0.tgz",
-            "integrity": "sha512-rQj0aAWOpCdCMRbI6pLQm8r7S2BM3YhTa0SzOYD55k+hJA8oo9J+H+9wLM9oMlZWOX/wJWPTzfDfmZkf7LvCfg==",
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
+            "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.0"
+                "@radix-ui/react-primitive": "2.1.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2159,10 +2174,17 @@
             "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
             "license": "MIT"
         },
+        "node_modules/@rolldown/pluginutils": {
+            "version": "1.0.0-beta.11",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.11.tgz",
+            "integrity": "sha512-L/gAA/hyCSuzTF1ftlzUSI/IKr2POHsv1Dd78GfqkR83KMNuswWD61JxGV2L7nRwBBBSDr6R1gCkdTmoN7W4ag==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
-            "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.43.0.tgz",
+            "integrity": "sha512-Krjy9awJl6rKbruhQDgivNbD1WuLb8xAclM4IR4cN5pHGAs2oIMMQJEiC3IC/9TZJ+QZkmZhlMO/6MBGxPidpw==",
             "cpu": [
                 "arm"
             ],
@@ -2174,9 +2196,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
-            "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.43.0.tgz",
+            "integrity": "sha512-ss4YJwRt5I63454Rpj+mXCXicakdFmKnUNxr1dLK+5rv5FJgAxnN7s31a5VchRYxCFWdmnDWKd0wbAdTr0J5EA==",
             "cpu": [
                 "arm64"
             ],
@@ -2188,9 +2210,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
-            "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.43.0.tgz",
+            "integrity": "sha512-eKoL8ykZ7zz8MjgBenEF2OoTNFAPFz1/lyJ5UmmFSz5jW+7XbH1+MAgCVHy72aG59rbuQLcJeiMrP8qP5d/N0A==",
             "cpu": [
                 "arm64"
             ],
@@ -2202,9 +2224,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
-            "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.43.0.tgz",
+            "integrity": "sha512-SYwXJgaBYW33Wi/q4ubN+ldWC4DzQY62S4Ll2dgfr/dbPoF50dlQwEaEHSKrQdSjC6oIe1WgzosoaNoHCdNuMg==",
             "cpu": [
                 "x64"
             ],
@@ -2216,9 +2238,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
-            "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.43.0.tgz",
+            "integrity": "sha512-SV+U5sSo0yujrjzBF7/YidieK2iF6E7MdF6EbYxNz94lA+R0wKl3SiixGyG/9Klab6uNBIqsN7j4Y/Fya7wAjQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2230,9 +2252,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
-            "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.43.0.tgz",
+            "integrity": "sha512-J7uCsiV13L/VOeHJBo5SjasKiGxJ0g+nQTrBkAsmQBIdil3KhPnSE9GnRon4ejX1XDdsmK/l30IYLiAaQEO0Cg==",
             "cpu": [
                 "x64"
             ],
@@ -2244,9 +2266,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
-            "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.43.0.tgz",
+            "integrity": "sha512-gTJ/JnnjCMc15uwB10TTATBEhK9meBIY+gXP4s0sHD1zHOaIh4Dmy1X9wup18IiY9tTNk5gJc4yx9ctj/fjrIw==",
             "cpu": [
                 "arm"
             ],
@@ -2258,9 +2280,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
-            "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.43.0.tgz",
+            "integrity": "sha512-ZJ3gZynL1LDSIvRfz0qXtTNs56n5DI2Mq+WACWZ7yGHFUEirHBRt7fyIk0NsCKhmRhn7WAcjgSkSVVxKlPNFFw==",
             "cpu": [
                 "arm"
             ],
@@ -2272,9 +2294,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
-            "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.43.0.tgz",
+            "integrity": "sha512-8FnkipasmOOSSlfucGYEu58U8cxEdhziKjPD2FIa0ONVMxvl/hmONtX/7y4vGjdUhjcTHlKlDhw3H9t98fPvyA==",
             "cpu": [
                 "arm64"
             ],
@@ -2286,9 +2308,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
-            "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.43.0.tgz",
+            "integrity": "sha512-KPPyAdlcIZ6S9C3S2cndXDkV0Bb1OSMsX0Eelr2Bay4EsF9yi9u9uzc9RniK3mcUGCLhWY9oLr6er80P5DE6XA==",
             "cpu": [
                 "arm64"
             ],
@@ -2300,9 +2322,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
-            "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.43.0.tgz",
+            "integrity": "sha512-HPGDIH0/ZzAZjvtlXj6g+KDQ9ZMHfSP553za7o2Odegb/BEfwJcR0Sw0RLNpQ9nC6Gy8s+3mSS9xjZ0n3rhcYg==",
             "cpu": [
                 "loong64"
             ],
@@ -2314,9 +2336,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
-            "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.43.0.tgz",
+            "integrity": "sha512-gEmwbOws4U4GLAJDhhtSPWPXUzDfMRedT3hFMyRAvM9Mrnj+dJIFIeL7otsv2WF3D7GrV0GIewW0y28dOYWkmw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2328,9 +2350,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
-            "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.43.0.tgz",
+            "integrity": "sha512-XXKvo2e+wFtXZF/9xoWohHg+MuRnvO29TI5Hqe9xwN5uN8NKUYy7tXUG3EZAlfchufNCTHNGjEx7uN78KsBo0g==",
             "cpu": [
                 "riscv64"
             ],
@@ -2342,9 +2364,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
-            "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.43.0.tgz",
+            "integrity": "sha512-ruf3hPWhjw6uDFsOAzmbNIvlXFXlBQ4nk57Sec8E8rUxs/AI4HD6xmiiasOOx/3QxS2f5eQMKTAwk7KHwpzr/Q==",
             "cpu": [
                 "riscv64"
             ],
@@ -2356,9 +2378,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
-            "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.43.0.tgz",
+            "integrity": "sha512-QmNIAqDiEMEvFV15rsSnjoSmO0+eJLoKRD9EAa9rrYNwO/XRCtOGM3A5A0X+wmG+XRrw9Fxdsw+LnyYiZWWcVw==",
             "cpu": [
                 "s390x"
             ],
@@ -2370,9 +2392,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-            "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.43.0.tgz",
+            "integrity": "sha512-jAHr/S0iiBtFyzjhOkAics/2SrXE092qyqEg96e90L3t9Op8OTzS6+IX0Fy5wCt2+KqeHAkti+eitV0wvblEoQ==",
             "cpu": [
                 "x64"
             ],
@@ -2384,9 +2406,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-            "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.43.0.tgz",
+            "integrity": "sha512-3yATWgdeXyuHtBhrLt98w+5fKurdqvs8B53LaoKD7P7H7FKOONLsBVMNl9ghPQZQuYcceV5CDyPfyfGpMWD9mQ==",
             "cpu": [
                 "x64"
             ],
@@ -2398,9 +2420,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
-            "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.43.0.tgz",
+            "integrity": "sha512-wVzXp2qDSCOpcBCT5WRWLmpJRIzv23valvcTwMHEobkjippNf+C3ys/+wf07poPkeNix0paTNemB2XrHr2TnGw==",
             "cpu": [
                 "arm64"
             ],
@@ -2412,9 +2434,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
-            "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.43.0.tgz",
+            "integrity": "sha512-fYCTEyzf8d+7diCw8b+asvWDCLMjsCEA8alvtAutqJOJp/wL5hs1rWSqJ1vkjgW0L2NB4bsYJrpKkiIPRR9dvw==",
             "cpu": [
                 "ia32"
             ],
@@ -2426,9 +2448,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
-            "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.43.0.tgz",
+            "integrity": "sha512-SnGhLiE5rlK0ofq8kzuDkM0g7FN1s5VYY+YSMTibP7CqShxCQvqtNxTARS4xX4PFJfHjG0ZQYX9iGzI3FQh5Aw==",
             "cpu": [
                 "x64"
             ],
@@ -2552,9 +2574,9 @@
             }
         },
         "node_modules/@types/estree": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+            "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
             "dev": true,
             "license": "MIT"
         },
@@ -2572,9 +2594,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.14.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
-            "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
+            "version": "22.15.32",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.32.tgz",
+            "integrity": "sha512-3jigKqgSjsH6gYZv2nEsqdXfZqIFGAV36XYYjf9KGZ3PSG+IhLecqPnI310RvjutyMwifE2hhhNEklOUrvx/wA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2582,16 +2604,16 @@
             }
         },
         "node_modules/@types/prop-types": {
-            "version": "15.7.14",
-            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-            "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+            "version": "15.7.15",
+            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
+            "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
             "devOptional": true,
             "license": "MIT"
         },
         "node_modules/@types/react": {
-            "version": "18.3.20",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.20.tgz",
-            "integrity": "sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==",
+            "version": "18.3.23",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
+            "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
@@ -2600,9 +2622,9 @@
             }
         },
         "node_modules/@types/react-dom": {
-            "version": "18.3.6",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.6.tgz",
-            "integrity": "sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==",
+            "version": "18.3.7",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
+            "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
             "devOptional": true,
             "license": "MIT",
             "peerDependencies": {
@@ -2617,21 +2639,21 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.0.tgz",
-            "integrity": "sha512-evaQJZ/J/S4wisevDvC1KFZkPzRetH8kYZbkgcTRyql3mcKsf+ZFDV1BVWUGTCAW5pQHoqn5gK5b8kn7ou9aFQ==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.34.1.tgz",
+            "integrity": "sha512-STXcN6ebF6li4PxwNeFnqF8/2BNDvBupf2OPx2yWNzr6mKNGF7q49VM00Pz5FaomJyqvbXpY6PhO+T9w139YEQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.31.0",
-                "@typescript-eslint/type-utils": "8.31.0",
-                "@typescript-eslint/utils": "8.31.0",
-                "@typescript-eslint/visitor-keys": "8.31.0",
+                "@typescript-eslint/scope-manager": "8.34.1",
+                "@typescript-eslint/type-utils": "8.34.1",
+                "@typescript-eslint/utils": "8.34.1",
+                "@typescript-eslint/visitor-keys": "8.34.1",
                 "graphemer": "^1.4.0",
-                "ignore": "^5.3.1",
+                "ignore": "^7.0.0",
                 "natural-compare": "^1.4.0",
-                "ts-api-utils": "^2.0.1"
+                "ts-api-utils": "^2.1.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2641,22 +2663,32 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "@typescript-eslint/parser": "^8.34.1",
                 "eslint": "^8.57.0 || ^9.0.0",
                 "typescript": ">=4.8.4 <5.9.0"
             }
         },
+        "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+            "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.31.0.tgz",
-            "integrity": "sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.34.1.tgz",
+            "integrity": "sha512-4O3idHxhyzjClSMJ0a29AcoK0+YwnEqzI6oz3vlRf3xw0zbzt15MzXwItOlnr5nIth6zlY2RENLsOPvhyrKAQA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.31.0",
-                "@typescript-eslint/types": "8.31.0",
-                "@typescript-eslint/typescript-estree": "8.31.0",
-                "@typescript-eslint/visitor-keys": "8.31.0",
+                "@typescript-eslint/scope-manager": "8.34.1",
+                "@typescript-eslint/types": "8.34.1",
+                "@typescript-eslint/typescript-estree": "8.34.1",
+                "@typescript-eslint/visitor-keys": "8.34.1",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2671,15 +2703,37 @@
                 "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.31.0.tgz",
-            "integrity": "sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==",
+        "node_modules/@typescript-eslint/project-service": {
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.34.1.tgz",
+            "integrity": "sha512-nuHlOmFZfuRwLJKDGQOVc0xnQrAmuq1Mj/ISou5044y1ajGNp2BNliIqp7F2LPQ5sForz8lempMFCovfeS1XoA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.31.0",
-                "@typescript-eslint/visitor-keys": "8.31.0"
+                "@typescript-eslint/tsconfig-utils": "^8.34.1",
+                "@typescript-eslint/types": "^8.34.1",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.34.1.tgz",
+            "integrity": "sha512-beu6o6QY4hJAgL1E8RaXNC071G4Kso2MGmJskCFQhRhg8VOH/FDbC8soP8NHN7e/Hdphwp8G8cE6OBzC8o41ZA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.34.1",
+                "@typescript-eslint/visitor-keys": "8.34.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2689,17 +2743,34 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
+        "node_modules/@typescript-eslint/tsconfig-utils": {
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.34.1.tgz",
+            "integrity": "sha512-K4Sjdo4/xF9NEeA2khOb7Y5nY6NSXBnod87uniVYW9kHP+hNlDV8trUSFeynA2uxWam4gIWgWoygPrv9VMWrYg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.31.0.tgz",
-            "integrity": "sha512-DJ1N1GdjI7IS7uRlzJuEDCgDQix3ZVYVtgeWEyhyn4iaoitpMBX6Ndd488mXSx0xah/cONAkEaYyylDyAeHMHg==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.34.1.tgz",
+            "integrity": "sha512-Tv7tCCr6e5m8hP4+xFugcrwTOucB8lshffJ6zf1mF1TbU67R+ntCc6DzLNKM+s/uzDyv8gLq7tufaAhIBYeV8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.31.0",
-                "@typescript-eslint/utils": "8.31.0",
+                "@typescript-eslint/typescript-estree": "8.34.1",
+                "@typescript-eslint/utils": "8.34.1",
                 "debug": "^4.3.4",
-                "ts-api-utils": "^2.0.1"
+                "ts-api-utils": "^2.1.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2714,9 +2785,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.31.0.tgz",
-            "integrity": "sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.34.1.tgz",
+            "integrity": "sha512-rjLVbmE7HR18kDsjNIZQHxmv9RZwlgzavryL5Lnj2ujIRTeXlKtILHgRNmQ3j4daw7zd+mQgy+uyt6Zo6I0IGA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2728,20 +2799,22 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.0.tgz",
-            "integrity": "sha512-xLmgn4Yl46xi6aDSZ9KkyfhhtnYI15/CvHbpOy/eR5NWhK/BK8wc709KKwhAR0m4ZKRP7h07bm4BWUYOCuRpQQ==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.34.1.tgz",
+            "integrity": "sha512-rjCNqqYPuMUF5ODD+hWBNmOitjBWghkGKJg6hiCHzUvXRy6rK22Jd3rwbP2Xi+R7oYVvIKhokHVhH41BxPV5mA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.31.0",
-                "@typescript-eslint/visitor-keys": "8.31.0",
+                "@typescript-eslint/project-service": "8.34.1",
+                "@typescript-eslint/tsconfig-utils": "8.34.1",
+                "@typescript-eslint/types": "8.34.1",
+                "@typescript-eslint/visitor-keys": "8.34.1",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
                 "minimatch": "^9.0.4",
                 "semver": "^7.6.0",
-                "ts-api-utils": "^2.0.1"
+                "ts-api-utils": "^2.1.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2755,9 +2828,9 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2781,9 +2854,9 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "version": "7.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -2794,16 +2867,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.31.0.tgz",
-            "integrity": "sha512-qi6uPLt9cjTFxAb1zGNgTob4x9ur7xC6mHQJ8GwEzGMGE9tYniublmJaowOJ9V2jUzxrltTPfdG2nKlWsq0+Ww==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.34.1.tgz",
+            "integrity": "sha512-mqOwUdZ3KjtGk7xJJnLbHxTuWVn3GO2WZZuM+Slhkun4+qthLdXx32C8xIXbO1kfCECb3jIs3eoxK3eryk7aoQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.31.0",
-                "@typescript-eslint/types": "8.31.0",
-                "@typescript-eslint/typescript-estree": "8.31.0"
+                "@eslint-community/eslint-utils": "^4.7.0",
+                "@typescript-eslint/scope-manager": "8.34.1",
+                "@typescript-eslint/types": "8.34.1",
+                "@typescript-eslint/typescript-estree": "8.34.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2818,14 +2891,14 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.0.tgz",
-            "integrity": "sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.34.1.tgz",
+            "integrity": "sha512-xoh5rJ+tgsRKoXnkBPFRLZ7rjKM0AfVbC68UZ/ECXoDbfggb9RbEySN359acY1vS3qZ0jVTVWzbtfapwm5ztxw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.31.0",
-                "eslint-visitor-keys": "^4.2.0"
+                "@typescript-eslint/types": "8.34.1",
+                "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2836,15 +2909,16 @@
             }
         },
         "node_modules/@vitejs/plugin-react": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz",
-            "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==",
+            "version": "4.5.2",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.5.2.tgz",
+            "integrity": "sha512-QNVT3/Lxx99nMQWJWF7K4N6apUEuT0KlZA3mx/mVaoGj3smm/8rc8ezz15J1pcbcjDK0V15rpHetVfya08r76Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.26.10",
-                "@babel/plugin-transform-react-jsx-self": "^7.25.9",
-                "@babel/plugin-transform-react-jsx-source": "^7.25.9",
+                "@babel/core": "^7.27.4",
+                "@babel/plugin-transform-react-jsx-self": "^7.27.1",
+                "@babel/plugin-transform-react-jsx-source": "^7.27.1",
+                "@rolldown/pluginutils": "1.0.0-beta.11",
                 "@types/babel__core": "^7.20.5",
                 "react-refresh": "^0.17.0"
             },
@@ -2852,7 +2926,7 @@
                 "node": "^14.18.0 || >=16.0.0"
             },
             "peerDependencies": {
-                "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
+                "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
             }
         },
         "node_modules/@xterm/addon-attach": {
@@ -2880,9 +2954,9 @@
             "license": "MIT"
         },
         "node_modules/acorn": {
-            "version": "8.14.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-            "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+            "version": "8.15.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+            "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -2979,9 +3053,9 @@
             "license": "Python-2.0"
         },
         "node_modules/aria-hidden": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
-            "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+            "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.0.0"
@@ -3047,9 +3121,9 @@
             }
         },
         "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3070,9 +3144,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.4",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz",
+            "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==",
             "dev": true,
             "funding": [
                 {
@@ -3090,10 +3164,10 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001688",
-                "electron-to-chromium": "^1.5.73",
+                "caniuse-lite": "^1.0.30001718",
+                "electron-to-chromium": "^1.5.160",
                 "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.1"
+                "update-browserslist-db": "^1.1.3"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -3103,17 +3177,17 @@
             }
         },
         "node_modules/c12": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.3.tgz",
-            "integrity": "sha512-uC3MacKBb0Z15o5QWCHvHWj5Zv34pGQj9P+iXKSpTuSGFS0KKhUWf4t9AJ+gWjYOdmWCPEGpEzm8sS0iqbpo1w==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.0.4.tgz",
+            "integrity": "sha512-t5FaZTYbbCtvxuZq9xxIruYydrAGsJ+8UdP0pZzMiK2xl/gNiSOy0OxhLzHUEEb0m1QXYqfzfvyIFEmz/g9lqg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "chokidar": "^4.0.3",
                 "confbox": "^0.2.2",
                 "defu": "^6.1.4",
-                "dotenv": "^16.4.7",
-                "exsolve": "^1.0.4",
+                "dotenv": "^16.5.0",
+                "exsolve": "^1.0.5",
                 "giget": "^2.0.0",
                 "jiti": "^2.4.2",
                 "ohash": "^2.0.11",
@@ -3158,9 +3232,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001715",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
-            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
+            "version": "1.0.30001723",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",
+            "integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==",
             "dev": true,
             "funding": [
                 {
@@ -3446,9 +3520,9 @@
             "license": "MIT"
         },
         "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -3530,9 +3604,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.140",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.140.tgz",
-            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
+            "version": "1.5.168",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.168.tgz",
+            "integrity": "sha512-RUNQmFLNIWVW6+z32EJQ5+qx8ci6RGvdtDC0Ls+F89wz6I2AthpXF0w0DIrn2jpLX0/PU9ZCo+Qp7bg/EckJmA==",
             "dev": true,
             "license": "ISC"
         },
@@ -3550,9 +3624,9 @@
             "license": "MIT"
         },
         "node_modules/esbuild": {
-            "version": "0.25.2",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
-            "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+            "version": "0.25.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
+            "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -3563,31 +3637,31 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.2",
-                "@esbuild/android-arm": "0.25.2",
-                "@esbuild/android-arm64": "0.25.2",
-                "@esbuild/android-x64": "0.25.2",
-                "@esbuild/darwin-arm64": "0.25.2",
-                "@esbuild/darwin-x64": "0.25.2",
-                "@esbuild/freebsd-arm64": "0.25.2",
-                "@esbuild/freebsd-x64": "0.25.2",
-                "@esbuild/linux-arm": "0.25.2",
-                "@esbuild/linux-arm64": "0.25.2",
-                "@esbuild/linux-ia32": "0.25.2",
-                "@esbuild/linux-loong64": "0.25.2",
-                "@esbuild/linux-mips64el": "0.25.2",
-                "@esbuild/linux-ppc64": "0.25.2",
-                "@esbuild/linux-riscv64": "0.25.2",
-                "@esbuild/linux-s390x": "0.25.2",
-                "@esbuild/linux-x64": "0.25.2",
-                "@esbuild/netbsd-arm64": "0.25.2",
-                "@esbuild/netbsd-x64": "0.25.2",
-                "@esbuild/openbsd-arm64": "0.25.2",
-                "@esbuild/openbsd-x64": "0.25.2",
-                "@esbuild/sunos-x64": "0.25.2",
-                "@esbuild/win32-arm64": "0.25.2",
-                "@esbuild/win32-ia32": "0.25.2",
-                "@esbuild/win32-x64": "0.25.2"
+                "@esbuild/aix-ppc64": "0.25.5",
+                "@esbuild/android-arm": "0.25.5",
+                "@esbuild/android-arm64": "0.25.5",
+                "@esbuild/android-x64": "0.25.5",
+                "@esbuild/darwin-arm64": "0.25.5",
+                "@esbuild/darwin-x64": "0.25.5",
+                "@esbuild/freebsd-arm64": "0.25.5",
+                "@esbuild/freebsd-x64": "0.25.5",
+                "@esbuild/linux-arm": "0.25.5",
+                "@esbuild/linux-arm64": "0.25.5",
+                "@esbuild/linux-ia32": "0.25.5",
+                "@esbuild/linux-loong64": "0.25.5",
+                "@esbuild/linux-mips64el": "0.25.5",
+                "@esbuild/linux-ppc64": "0.25.5",
+                "@esbuild/linux-riscv64": "0.25.5",
+                "@esbuild/linux-s390x": "0.25.5",
+                "@esbuild/linux-x64": "0.25.5",
+                "@esbuild/netbsd-arm64": "0.25.5",
+                "@esbuild/netbsd-x64": "0.25.5",
+                "@esbuild/openbsd-arm64": "0.25.5",
+                "@esbuild/openbsd-x64": "0.25.5",
+                "@esbuild/sunos-x64": "0.25.5",
+                "@esbuild/win32-arm64": "0.25.5",
+                "@esbuild/win32-ia32": "0.25.5",
+                "@esbuild/win32-x64": "0.25.5"
             }
         },
         "node_modules/escalade": {
@@ -3614,20 +3688,20 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.25.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.25.1.tgz",
-            "integrity": "sha512-E6Mtz9oGQWDCpV12319d59n4tx9zOTXSTmc8BLVxBx+G/0RdM5MvEEJLU9c0+aleoePYYgVTOsRblx433qmhWQ==",
+            "version": "9.29.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.29.0.tgz",
+            "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.20.0",
+                "@eslint/config-array": "^0.20.1",
                 "@eslint/config-helpers": "^0.2.1",
-                "@eslint/core": "^0.13.0",
+                "@eslint/core": "^0.14.0",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.25.1",
-                "@eslint/plugin-kit": "^0.2.8",
+                "@eslint/js": "9.29.0",
+                "@eslint/plugin-kit": "^0.3.1",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
@@ -3638,9 +3712,9 @@
                 "cross-spawn": "^7.0.6",
                 "debug": "^4.3.2",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^8.3.0",
-                "eslint-visitor-keys": "^4.2.0",
-                "espree": "^10.3.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",
@@ -3698,9 +3772,9 @@
             }
         },
         "node_modules/eslint-scope": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-            "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+            "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -3715,9 +3789,9 @@
             }
         },
         "node_modules/eslint-visitor-keys": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -3728,15 +3802,15 @@
             }
         },
         "node_modules/espree": {
-            "version": "10.3.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+            "version": "10.4.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+            "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "acorn": "^8.14.0",
+                "acorn": "^8.15.0",
                 "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^4.2.0"
+                "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4099,9 +4173,9 @@
             }
         },
         "node_modules/glob/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "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"
@@ -4212,9 +4286,9 @@
             }
         },
         "node_modules/i18next-browser-languagedetector": {
-            "version": "8.0.5",
-            "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.0.5.tgz",
-            "integrity": "sha512-OstebRKqKiQw8xEvQF5aRyUujsCatanj7Q9eo5iiH2gJpoXGZ7483ol3sVBwfqbobTQPNH1J+NAyJ1aCQoEC+w==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.0.tgz",
+            "integrity": "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.23.2"
@@ -4361,9 +4435,9 @@
             }
         },
         "node_modules/jotai": {
-            "version": "2.12.3",
-            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.3.tgz",
-            "integrity": "sha512-DpoddSkmPGXMFtdfnoIHfueFeGP643nqYUWC6REjUcME+PG2UkAtYnLbffRDw3OURI9ZUTcRWkRGLsOvxuWMCg==",
+            "version": "2.12.5",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.12.5.tgz",
+            "integrity": "sha512-G8m32HW3lSmcz/4mbqx0hgJIQ0ekndKWiYP7kWVKi0p6saLXdSoye+FZiOFyonnd7Q482LCzm8sMDl7Ar1NWDw==",
             "license": "MIT",
             "peer": true,
             "engines": {
@@ -5072,9 +5146,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.5.3",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-            "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+            "version": "8.5.6",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+            "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -5091,7 +5165,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.8",
+                "nanoid": "^3.3.11",
                 "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
@@ -5241,9 +5315,9 @@
             }
         },
         "node_modules/prettier-plugin-tailwindcss": {
-            "version": "0.6.11",
-            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz",
-            "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==",
+            "version": "0.6.12",
+            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.12.tgz",
+            "integrity": "sha512-OuTQKoqNwV7RnxTPwXWzOFXy6Jc4z8oeRZYGuMpRyG3WbuR3jjXdQFK8qFBMBx8UHWdHrddARz2fgUenild6aw==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.21.3"
@@ -5381,9 +5455,9 @@
             }
         },
         "node_modules/react-hook-form": {
-            "version": "7.56.0",
-            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.0.tgz",
-            "integrity": "sha512-U2QQgx5z2Y8Z0qlXv3W19hWHJgfKdWMz0O/osuY+o+CYq568V2R/JhzC6OAXfR8k24rIN0Muan2Qliaq9eKs/g==",
+            "version": "7.58.0",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.58.0.tgz",
+            "integrity": "sha512-zGijmEed35oNfOfy7ub99jfjkiLhHwA3dl5AgyKdWC6QQzhnc7tkWewSa+T+A2EpLrc6wo5DUoZctS9kufWJjA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.0.0"
@@ -5397,17 +5471,18 @@
             }
         },
         "node_modules/react-i18next": {
-            "version": "15.4.1",
-            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz",
-            "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==",
+            "version": "15.5.3",
+            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.5.3.tgz",
+            "integrity": "sha512-ypYmOKOnjqPEJZO4m1BI0kS8kWqkBNsKYyhVUfij0gvjy9xJNoG/VcGkxq5dRlVwzmrmY1BQMAmpbbUBLwC4Kw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.25.0",
+                "@babel/runtime": "^7.27.6",
                 "html-parse-stringify": "^3.0.1"
             },
             "peerDependencies": {
                 "i18next": ">= 23.2.3",
-                "react": ">= 16.8.0"
+                "react": ">= 16.8.0",
+                "typescript": "^5"
             },
             "peerDependenciesMeta": {
                 "react-dom": {
@@ -5415,6 +5490,9 @@
                 },
                 "react-native": {
                     "optional": true
+                },
+                "typescript": {
+                    "optional": true
                 }
             }
         },
@@ -5429,9 +5507,9 @@
             }
         },
         "node_modules/react-remove-scroll": {
-            "version": "2.6.3",
-            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
-            "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz",
+            "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==",
             "license": "MIT",
             "dependencies": {
                 "react-remove-scroll-bar": "^2.3.7",
@@ -5476,14 +5554,13 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.5.1",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.1.tgz",
-            "integrity": "sha512-/jjU3fcYNd2bwz9Q0xt5TwyiyoO8XjSEFXJY4O/lMAlkGTHWuHRAbR9Etik+lSDqMC7A7mz3UlXzgYT6Vl58sA==",
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.2.tgz",
+            "integrity": "sha512-U7Nv3y+bMimgWjhlT5CRdzHPu2/KVmqPwKUCChW8en5P3znxUqwlYFlbmyj8Rgp1SF6zs5X4+77kBVknkg6a0w==",
             "license": "MIT",
             "dependencies": {
                 "cookie": "^1.0.1",
-                "set-cookie-parser": "^2.6.0",
-                "turbo-stream": "2.4.0"
+                "set-cookie-parser": "^2.6.0"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5499,12 +5576,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.5.1",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.1.tgz",
-            "integrity": "sha512-5DPSPc7ENrt2tlKPq0FtpG80ZbqA9aIKEyqX6hSNJDlol/tr6iqCK4crqdsusmOSSotq6zDsn0y3urX9TuTNmA==",
+            "version": "7.6.2",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.6.2.tgz",
+            "integrity": "sha512-Q8zb6VlTbdYKK5JJBLQEN06oTUa/RAbG/oQS1auK1I0TbJOXktqm+QENEVJU6QvWynlXPRBXI3fiOQcSEA78rA==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.5.1"
+                "react-router": "7.6.2"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5537,9 +5614,9 @@
             }
         },
         "node_modules/react-virtuoso": {
-            "version": "4.12.6",
-            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.12.6.tgz",
-            "integrity": "sha512-bfvS6aCL1ehXmq39KRiz/vxznGUbtA27I5I24TYCe1DhMf84O3aVNCIwrSjYQjkJGJGzY46ihdN8WkYlemuhMQ==",
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.13.0.tgz",
+            "integrity": "sha512-XHv2Fglpx80yFPdjZkV9d1baACKghg/ucpDFEXwaix7z0AfVQj+mF6lM+YQR6UC/TwzXG2rJKydRMb3+7iV3PA==",
             "license": "MIT",
             "peerDependencies": {
                 "react": ">=16 || >=17 || >= 18 || >= 19",
@@ -5579,12 +5656,6 @@
                 "url": "https://github.com/Mermade/oas-kit?sponsor=1"
             }
         },
-        "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"
-        },
         "node_modules/require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5636,9 +5707,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.40.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-            "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
+            "version": "4.43.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.43.0.tgz",
+            "integrity": "sha512-wdN2Kd3Twh8MAEOEJZsuxuLKCsBEo4PVNLK6tQWAn10VhsVewQLzcucMgLolRlhFybGxfclbPeEYBaP6RvUFGg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5652,29 +5723,36 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.40.0",
-                "@rollup/rollup-android-arm64": "4.40.0",
-                "@rollup/rollup-darwin-arm64": "4.40.0",
-                "@rollup/rollup-darwin-x64": "4.40.0",
-                "@rollup/rollup-freebsd-arm64": "4.40.0",
-                "@rollup/rollup-freebsd-x64": "4.40.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.40.0",
-                "@rollup/rollup-linux-arm64-musl": "4.40.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.40.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.40.0",
-                "@rollup/rollup-linux-x64-gnu": "4.40.0",
-                "@rollup/rollup-linux-x64-musl": "4.40.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.40.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.40.0",
-                "@rollup/rollup-win32-x64-msvc": "4.40.0",
+                "@rollup/rollup-android-arm-eabi": "4.43.0",
+                "@rollup/rollup-android-arm64": "4.43.0",
+                "@rollup/rollup-darwin-arm64": "4.43.0",
+                "@rollup/rollup-darwin-x64": "4.43.0",
+                "@rollup/rollup-freebsd-arm64": "4.43.0",
+                "@rollup/rollup-freebsd-x64": "4.43.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.43.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.43.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.43.0",
+                "@rollup/rollup-linux-arm64-musl": "4.43.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.43.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.43.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.43.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.43.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.43.0",
+                "@rollup/rollup-linux-x64-gnu": "4.43.0",
+                "@rollup/rollup-linux-x64-musl": "4.43.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.43.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.43.0",
+                "@rollup/rollup-win32-x64-msvc": "4.43.0",
                 "fsevents": "~2.3.2"
             }
         },
+        "node_modules/rollup/node_modules/@types/estree": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+            "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/run-parallel": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -5996,16 +6074,16 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.1.1",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.1.1.tgz",
-            "integrity": "sha512-Slwbvz1cAno7TjujKfKIvGK5R72BlpQhnVUUtK/TcQjx/pMIiGVCaLaJWOux0mye7LEABABAhUwArFEAusuAcQ==",
+            "version": "13.2.2",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.2.tgz",
+            "integrity": "sha512-g67Bn18qujAu7L7EWexjR4R0MDiSYo+HT5EkV/5IJ5HuuP8N8Pcj4mrbBY1GX5BTeGGw7Vd5nSE9jgLj0IxinQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@biomejs/js-api": "^0.7.1",
-                "@biomejs/wasm-nodejs": "^1.9.4",
+                "@biomejs/js-api": "0.8.0-beta.3",
+                "@biomejs/wasm-nodejs": "2.0.0-beta.6",
                 "@types/swagger-schema-official": "^2.0.25",
-                "c12": "^3.0.3",
+                "c12": "^3.0.4",
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
                 "eta": "^2.2.0",
@@ -6021,9 +6099,16 @@
                 "swagger-typescript-api": "dist/cli.js"
             },
             "engines": {
-                "node": ">=18.0.0"
+                "node": ">=20"
             }
         },
+        "node_modules/swagger-typescript-api/node_modules/@biomejs/wasm-nodejs": {
+            "version": "2.0.0-beta.6",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.0.0-beta.6.tgz",
+            "integrity": "sha512-UI8uhz8YUjROBqr8OX3M8aK5Dw+MQfpE3D8sODCoE1CHH/4lvYdYksO/hU6qUe7qOYTI/Dyf2/DOQA5XRvRtAg==",
+            "dev": true,
+            "license": "MIT OR Apache-2.0"
+        },
         "node_modules/swagger-typescript-api/node_modules/nanoid": {
             "version": "5.1.5",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
@@ -6250,9 +6335,9 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+            "version": "0.2.14",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+            "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -6267,9 +6352,9 @@
             }
         },
         "node_modules/tinyglobby/node_modules/fdir": {
-            "version": "6.4.4",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "version": "6.4.6",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -6344,12 +6429,6 @@
             "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
             "license": "0BSD"
         },
-        "node_modules/turbo-stream": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-            "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
-            "license": "ISC"
-        },
         "node_modules/type-check": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6378,15 +6457,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.31.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.31.0.tgz",
-            "integrity": "sha512-u+93F0sB0An8WEAPtwxVhFby573E8ckdjwUUQUj9QA4v8JAvgtoDdIyYR3XFwFHq2W1KJ1AurwJCO+w+Y1ixyQ==",
+            "version": "8.34.1",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.34.1.tgz",
+            "integrity": "sha512-XjS+b6Vg9oT1BaIUfkW3M3LvqZE++rbzAMEHuccCfO/YkP43ha6w3jTEMilQxMF92nVOYCcdjv1ZUhAa1D/0ow==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.31.0",
-                "@typescript-eslint/parser": "8.31.0",
-                "@typescript-eslint/utils": "8.31.0"
+                "@typescript-eslint/eslint-plugin": "8.34.1",
+                "@typescript-eslint/parser": "8.34.1",
+                "@typescript-eslint/utils": "8.34.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6520,18 +6599,18 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.3.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.2.tgz",
-            "integrity": "sha512-ZSvGOXKGceizRQIZSz7TGJ0pS3QLlVY/9hwxVh17W3re67je1RKYzFHivZ/t0tubU78Vkyb9WnHPENSBCzbckg==",
+            "version": "6.3.5",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+            "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.25.0",
-                "fdir": "^6.4.3",
+                "fdir": "^6.4.4",
                 "picomatch": "^4.0.2",
                 "postcss": "^8.5.3",
                 "rollup": "^4.34.9",
-                "tinyglobby": "^0.2.12"
+                "tinyglobby": "^0.2.13"
             },
             "bin": {
                 "vite": "bin/vite.js"
@@ -6595,9 +6674,9 @@
             }
         },
         "node_modules/vite/node_modules/fdir": {
-            "version": "6.4.4",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "version": "6.4.6",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -6780,15 +6859,15 @@
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-            "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+            "version": "2.8.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.0.tgz",
+            "integrity": "sha512-4lLa/EcQCB0cJkyts+FpIRx5G/llPxfP6VQU5KByHEhLxY3IJCH0f0Hy1MHI8sClTvsIb8qwRJ6R/ZdlDJ/leQ==",
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
             },
             "engines": {
-                "node": ">= 14"
+                "node": ">= 14.6"
             }
         },
         "node_modules/yargs": {
@@ -6879,18 +6958,18 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.24.3",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz",
-            "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==",
+            "version": "3.25.67",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+            "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
         },
         "node_modules/zustand": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.3.tgz",
-            "integrity": "sha512-14fwWQtU3pH4dE0dOpdMiWjddcH+QzKIgk1cl8epwSE7yag43k/AD/m4L6+K7DytAOr9gGBe3/EXj9g7cdostg==",
+            "version": "5.0.5",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.5.tgz",
+            "integrity": "sha512-mILtRfKW9xM47hqxGIxCv12gXusoY/xTSHBYApXozR0HmQv299whhBeeAcRy+KrPPybzosvJBCOmVjq6x12fCg==",
             "license": "MIT",
             "engines": {
                 "node": ">=12.20.0"
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index c2abd6506922..5d97590122dd 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-M1iJmSskXk0Qhr+p9yradZE4Xnf88F28NBUfJw4Wr34=";
+    hash = "sha256-9/lrbVfC+CRQCSJNx7dwKWPgemM6hbd6ZR5xG3tj8wA=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-y0MnD6ymU4YDpNkTrEKMROHwllSVRm1LQeG0v3IPa0Y=";
+  npmDepsHash = "sha256-2iX3/Pw6i2zXH+cpMC6ttn5D/C8G/P9WgRApO7Br5p4=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 78b961b03e16..838b8913abb3 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -286,7 +286,6 @@ def reexec(
                 NIXOS_REBUILD_ATTR,
                 flake,
                 flake_build_flags | {"no_link": True},
-                quiet=True,
             )
         else:
             build_attr = BuildAttr.from_arg(args.attr, args.file)
@@ -294,7 +293,6 @@ def reexec(
                 NIXOS_REBUILD_ATTR,
                 build_attr,
                 build_flags | {"no_out_link": True},
-                quiet=True,
             )
     except CalledProcessError:
         logger.warning(
@@ -306,7 +304,7 @@ def reexec(
         new = drv / f"bin/{EXECUTABLE}"
         current = Path(argv[0])
         if new != current:
-            logging.debug(
+            logger.debug(
                 "detected newer version of script, re-exec'ing, current=%s, new=%s",
                 current,
                 new,
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 dc95b914b360..3be610b5ddbd 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
@@ -51,7 +51,6 @@ def build(
     attr: str,
     build_attr: BuildAttr,
     build_flags: Args | None = None,
-    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using classic Nix.
 
@@ -64,7 +63,7 @@ def build(
         build_attr.to_attr(attr),
         *dict_to_flags(build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
+    r = run_wrapper(run_args, stdout=PIPE)
     return Path(r.stdout.strip())
 
 
@@ -72,7 +71,6 @@ def build_flake(
     attr: str,
     flake: Flake,
     flake_build_flags: Args | None = None,
-    quiet: bool = False,
 ) -> Path:
     """Build NixOS attribute using Flakes.
 
@@ -86,7 +84,7 @@ def build_flake(
         flake.to_attr(attr),
         *dict_to_flags(flake_build_flags),
     ]
-    r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None)
+    r = run_wrapper(run_args, stdout=PIPE)
     return Path(r.stdout.strip())
 
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 22b7054000a8..a66d70498c5f 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -143,7 +143,6 @@ def test_reexec(mock_build: Mock, mock_execve: Mock, monkeypatch: MonkeyPatch) -
                 nr.NIXOS_REBUILD_ATTR,
                 nr.models.BuildAttr(ANY, ANY),
                 {"build": True, "no_out_link": True},
-                quiet=True,
             )
         ]
     )
@@ -185,10 +184,9 @@ def test_reexec_flake(
 
     nr.reexec(argv, args, {"build": True}, {"flake": True})
     mock_build.assert_called_once_with(
-        "config.system.build.nixos-rebuild",
+        nr.NIXOS_REBUILD_ATTR,
         nr.models.Flake(ANY, ANY),
         {"flake": True, "no_link": True},
-        quiet=True,
     )
     # do not exec if there is no new version
     mock_execve.assert_not_called()
@@ -268,7 +266,6 @@ def test_execute_nix_boot(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -343,7 +340,6 @@ def test_execute_nix_build_vm(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -408,7 +404,6 @@ def test_execute_nix_build_image_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -476,7 +471,6 @@ def test_execute_nix_switch_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -767,7 +761,6 @@ def test_execute_nix_switch_flake_target_host(
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
@@ -1035,7 +1028,6 @@ def test_execute_build(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             )
         ]
@@ -1075,7 +1067,6 @@ def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:
                 ],
                 check=True,
                 stdout=PIPE,
-                stderr=None,
                 **DEFAULT_RUN_KWARGS,
             ),
             call(
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 195f929aaf53..d87b6b62dca8 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
@@ -36,18 +36,14 @@ def test_build(mock_run: Mock) -> None:
             "foo",
         ],
         stdout=PIPE,
-        stderr=None,
     )
 
     assert n.build(
-        "config.system.build.attr",
-        m.BuildAttr(Path("file"), "preAttr"),
-        quiet=True,
+        "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr")
     ) == Path("/path/to/file")
     mock_run.assert_called_with(
         ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"],
         stdout=PIPE,
-        stderr=PIPE,
     )
 
 
@@ -78,26 +74,6 @@ def test_build_flake(mock_run: Mock, monkeypatch: MonkeyPatch, tmpdir: Path) ->
             "foo",
         ],
         stdout=PIPE,
-        stderr=None,
-    )
-
-    assert n.build_flake(
-        "config.system.build.toplevel",
-        flake,
-        None,
-        quiet=True,
-    ) == Path("/path/to/file")
-    mock_run.assert_called_with(
-        [
-            "nix",
-            "--extra-experimental-features",
-            "nix-command flakes",
-            "build",
-            "--print-out-paths",
-            '.#nixosConfigurations."hostname".config.system.build.toplevel',
-        ],
-        stdout=PIPE,
-        stderr=PIPE,
     )
 
 
diff --git a/pkgs/by-name/nj/njq/package.nix b/pkgs/by-name/nj/njq/package.nix
new file mode 100644
index 000000000000..a7073e75b7e9
--- /dev/null
+++ b/pkgs/by-name/nj/njq/package.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "njq";
+  version = "0.0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "Rucadi";
+    repo = "njq";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-evFKm5NYNqIIRVbtMlGFY0k+0sJnkTCTIbTH7w9jQtk=";
+  };
+
+  cargoHash = "sha256-tDz9+iQhutlo7petKmg6n/mg0tDntGRqwBALcATJwdM=";
+
+  meta = {
+    description = "Command-line JSON processor using nix as query language";
+    homepage = "https://github.com/Rucadi/njq";
+    mainProgram = "njq";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ powwu ];
+  };
+})
diff --git a/pkgs/by-name/nw/nwg-menu/package.nix b/pkgs/by-name/nw/nwg-menu/package.nix
index 7942430a26db..b45d9312e318 100644
--- a/pkgs/by-name/nw/nwg-menu/package.nix
+++ b/pkgs/by-name/nw/nwg-menu/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "nwg-menu";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-menu";
     rev = "v${version}";
-    sha256 = "sha256-Ce8hxFVCj/No2Sb6avQ9ogMPTJXDcWxa3GFfsczq1+E=";
+    sha256 = "sha256-3fN89HPwobMiijlvGJ80HexCBdsPLsEvAz9VH8dO4qc=";
   };
 
-  vendorHash = "sha256-53lRO4Ct20jYJY7JRElx9MWzb+TEm8KIIJZF3OfL1kQ=";
+  vendorHash = "sha256-5gazNUZdPZh21lcnVFKPSDc/JLi8d6tqfP4NKMzPa8U=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 01ff13010866..4fba049379bc 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,13 +14,13 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4FRNTB24JWyF3Zuhx3T6LjNs83+wDh4gmE9rh3cu/Vk=";
+    hash = "sha256-gIwi+38oUBEVK5DiTU8Avt+lQtXaIf/udyVi4LLvTu8=";
   };
 
   vendorHash = null;
@@ -31,7 +31,6 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X github.com/open-policy-agent/opa/version.Version=${finalAttrs.version}"
   ];
 
@@ -50,6 +49,7 @@ buildGoModule (finalAttrs: {
           # Skip tests that require network, not available in the nix sandbox
           "TestInterQueryCache_ClientError"
           "TestIntraQueryCache_ClientError"
+          "TestSSOCredentialService"
         ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin [
           # Skip tests that require network, not available in the darwin sandbox
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index cc1022ac6f87..8db4f1952840 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.6.14";
+  version = "0.6.15";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-tq6npchWuEzgMOoCUvwHGbDjpJPOO1eSCS/88IzhWvQ=";
+    hash = "sha256-MD7d+5JuTzChqKLxXyZFLyPktXFta1EOe4Oj4uEGaho=";
   };
 
   frontend = buildNpmPackage rec {
diff --git a/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix
index 13a9c593090d..4e1e61333455 100644
--- a/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix
+++ b/pkgs/by-name/op/opencloud-desktop-shell-integration-resources/package.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
+  dontWrapQtApps = true;
+
   meta = {
     description = "Shared assets for OpenCloud desktop shell integrations";
     homepage = "https://github.com/opencloud-eu/desktop-shell-integration-resources";
diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix
index 544bd7f6a8cb..ae6e3a879f4a 100644
--- a/pkgs/by-name/op/openmolcas/package.nix
+++ b/pkgs/by-name/op/openmolcas/package.nix
@@ -69,13 +69,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openmolcas";
-  version = "25.02";
+  version = "25.06";
 
   src = fetchFromGitLab {
     owner = "Molcas";
     repo = "OpenMolcas";
     rev = "v${version}";
-    hash = "sha256-Ty7C7zj1lQixuUzeKLcwQCmcPexZXtIGDzp1wUMKDi0=";
+    hash = "sha256-/d+jusCFtbAVwvords2B7Cxuxh3FwnR/AWGDeir43oU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/op/openomf/package.nix b/pkgs/by-name/op/openomf/package.nix
index fb8268c096d4..15a3172bbb8a 100644
--- a/pkgs/by-name/op/openomf/package.nix
+++ b/pkgs/by-name/op/openomf/package.nix
@@ -37,13 +37,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openomf";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "omf2097";
     repo = "openomf";
     tag = finalAttrs.version;
-    hash = "sha256-vp/aiKFAWiBb8pxjivB54fr84CLW9vaBa1U8Ye/cF4M=";
+    hash = "sha256-9vd/LirurXFtmcG0U5SG8Oa66kcJ1EiaBmzfMxgnaqQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openterface-qt/package.nix b/pkgs/by-name/op/openterface-qt/package.nix
index 9484966fd8bf..6b3d86c32108 100644
--- a/pkgs/by-name/op/openterface-qt/package.nix
+++ b/pkgs/by-name/op/openterface-qt/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (final: {
   pname = "openterface-qt";
-  version = "0.3.14";
+  version = "0.3.15";
   src = fetchFromGitHub {
     owner = "TechxArtisanStudio";
     repo = "Openterface_QT";
     rev = "${final.version}";
-    hash = "sha256-HHHLQwycnMme3Ch538ram6tkG3OYUcd4NFCUcL4vIjk=";
+    hash = "sha256-wU30m8dQirrLcYNFs4lTKIrng7B4HapHeVsyLR619PY=";
   };
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix
index 88786f1d12af..dbc1e9b595ba 100644
--- a/pkgs/by-name/ov/ovn/package.nix
+++ b/pkgs/by-name/ov/ovn/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ovn";
-  version = "25.03.0";
+  version = "25.03.1";
 
   src = fetchFromGitHub {
     owner = "ovn-org";
     repo = "ovn";
     tag = "v${version}";
-    hash = "sha256-UbCmXPft9SCsbPZ+GuTWIOUUhv+RaC55jNiTjsVBeRw=";
+    hash = "sha256-nDW3jwZ0RE9i+5+8eRKb7P7KQxiGd22dn/s7bzx/CjQ=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/pa/pagemon/package.nix b/pkgs/by-name/pa/pagemon/package.nix
index edc7c34c10f6..2cd0481d1335 100644
--- a/pkgs/by-name/pa/pagemon/package.nix
+++ b/pkgs/by-name/pa/pagemon/package.nix
@@ -5,15 +5,15 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pagemon";
-  version = "0.01.18";
+  version = "0.02.05";
 
   src = fetchFromGitHub {
-    sha256 = "1aq1mq3k8n70h81s64w2zg4kksw1y05326bn4y8p94lpaypvxqfd";
-    rev = "V${version}";
-    repo = "pagemon";
     owner = "ColinIanKing";
+    repo = "pagemon";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-Crr1312wZ1IIwvODAUooZ0Lr75W0qdDQrr1sszaNHa4=";
   };
 
   buildInputs = [ ncurses ];
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "BINDIR=$(out)/bin"
     "MANDIR=$(out)/share/man/man8"
+    "BASHDIR=$(out)/share/bash-completion/completions"
   ];
 
-  meta = with lib; {
-    inherit (src.meta) homepage;
+  meta = {
+    inherit (finalAttrs.src.meta) homepage;
     description = "Interactive memory/page monitor for Linux";
     mainProgram = "pagemon";
     longDescription = ''
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
       pages of memory belonging data, code, heap, stack, anonymous mappings
       or even swapped-out pages.
     '';
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix
index 356d469f6478..11bc62495fdd 100644
--- a/pkgs/by-name/pd/pdi/package.nix
+++ b/pkgs/by-name/pd/pdi/package.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdi";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "pdidev";
     repo = "pdi";
     tag = finalAttrs.version;
-    hash = "sha256-Tmn4M+tcnNH6Bm4t5D/VgciOu4dDKKqYkbERKgpHX/Y=";
+    hash = "sha256-bbhsMbTVvG19vtkZyOiCRH168kCFk2ahSFc7davfXzo=";
   };
 
   # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :')
diff --git a/pkgs/by-name/pi/pigpio/package.nix b/pkgs/by-name/pi/pigpio/package.nix
index ddde61ca0b7b..56f4c6bcdccf 100644
--- a/pkgs/by-name/pi/pigpio/package.nix
+++ b/pkgs/by-name/pi/pigpio/package.nix
@@ -28,7 +28,7 @@ mkDerivation rec {
   meta = {
     description = "C library for the Raspberry which allows control of the General Purpose Input Outputs (GPIO)";
     homepage = "https://github.com/joan2937/pigpio";
-    license = with lib.licenses; [ unlicense ];
+    license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ doronbehar ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/pi/piscope/package.nix b/pkgs/by-name/pi/piscope/package.nix
index 9873ada380eb..5f064722f4b2 100644
--- a/pkgs/by-name/pi/piscope/package.nix
+++ b/pkgs/by-name/pi/piscope/package.nix
@@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-VDrx/RLSpMhyD64PmdeWVacb9LleHakcy7D6zFxeyhw=";
   };
   # Fix FHS paths
-  postConfigure = ''
+  postPatch = ''
     substituteInPlace piscope.c \
-      --replace /usr/share/piscope $out/share/piscope
+      --replace-fail /usr/share/piscope $out/share/piscope
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index dded8d345ea4..b165b93dac47 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -22,7 +22,7 @@
 }:
 let
   pname = "positron-bin";
-  version = "2025.05.0-75";
+  version = "2025.06.0-146";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -31,12 +31,17 @@ stdenv.mkDerivation {
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/mac/universal/Positron-${version}.dmg";
-        hash = "sha256-dmRYKysQJYrNWyGvH9DsNIC0tIHYNix7QWagVtuGx1g=";
+        hash = "sha256-V9ADtOskxEbGZryXD/6aiUDeTvqPzoY372f/Vo5195s=";
+      }
+    else if stdenv.hostPlatform.system == "aarch64-linux" then
+      fetchurl {
+        url = "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${version}-arm64.deb";
+        hash = "sha256-FiCTF5Bmfp4id9HXuB4luSGT9A7OoquaRW/QIh0A3ZY=";
       }
     else
       fetchurl {
         url = "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${version}-x64.deb";
-        hash = "sha256-dmJrDE3g44aoCsVBvSDDFLt38uIqxzaXPBhcmu/U5Oo=";
+        hash = "sha256-FnNoLV9uqgUeumYpHtRJuHrFA6mL65KI4jru7Ebq0/o=";
       };
 
   buildInputs =
@@ -133,6 +138,9 @@ stdenv.mkDerivation {
       detroyejr
     ];
     mainProgram = "positron";
-    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ] ++ platforms.darwin;
   };
 }
diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh
index 3e3966a356e9..76c16930fc01 100755
--- a/pkgs/by-name/po/positron-bin/update.sh
+++ b/pkgs/by-name/po/positron-bin/update.sh
@@ -27,7 +27,7 @@ new_hash=$(nix store prefetch-file --json --hash-type sha256 \
 
 sed -i "s|$current_hash|$new_hash|g" $positron_nix
 
-# Update Linux hash.
+# Update Linux x86_64 hash.
 current_hash=$(nix store prefetch-file --json --hash-type sha256 \
     "https://cdn.posit.co/positron/dailies/deb/x86_64/Positron-${current_version}-x64.deb" \
     | jq -r .hash)
@@ -38,17 +38,16 @@ new_hash=$(nix store prefetch-file --json --hash-type sha256 \
 
 sed -i "s|$current_hash|$new_hash|g" $positron_nix
 
+# Update Linux aarch64 hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${current_version}-arm64.deb" \
+    | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+    "https://cdn.posit.co/positron/dailies/deb/arm64/Positron-${new_version}-arm64.deb" \
+    | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
 # Update version
 sed -i "s|$current_version|$new_version|g" $positron_nix
-
-# Attempt to build.
-export NIXPKGS_ALLOW_UNFREE=1
-
-if ! nix-build -A positron-bin "$nixpkgs"; then
-  echo "The updated positron-bin failed to build."
-  exit 1
-fi
-
-# Commit changes
-git add "$positron_nix"
-git commit -m "positron-bin: ${current_version} -> ${new_version}"
diff --git a/pkgs/by-name/pr/precious/package.nix b/pkgs/by-name/pr/precious/package.nix
new file mode 100644
index 000000000000..6f2bbb86252c
--- /dev/null
+++ b/pkgs/by-name/pr/precious/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "precious";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "houseabsolute";
+    repo = "precious";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-moJk8bwMlYtfo+Iq/OcjJkQJQiirZ6oKSoATpW3KcQI=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-nvHP5/njvkXcI3QtFU4CijXaX5l4DabMMVzvktvFNvA=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "One code quality tool to rule them all";
+    homepage = "https://github.com/houseabsolute/precious";
+    changelog = "https://github.com/houseabsolute/precious/releases/tag/v${finalAttrs.version}";
+    mainProgram = "precious";
+    maintainers = with lib.maintainers; [ abhisheksingh0x558 ];
+    license = with lib.licenses; [
+      mit # or
+      asl20
+    ];
+  };
+})
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 63ff211b5f48..5909434207a1 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  fetchpatch2,
   installShellFiles,
 }:
 
@@ -29,6 +30,15 @@ buildGoModule rec {
     '';
   };
 
+  patches = [
+    # Fix a linker issue with dlopen on x86_64-darwin
+    # https://github.com/f1bonacc1/process-compose/pull/342
+    (fetchpatch2 {
+      url = "https://github.com/F1bonacc1/process-compose/commit/af82749c5dacaa20f2c3b07ca4e081d1b38e40c4.patch";
+      hash = "sha256-5Hgvwn2GEp/lINPefxXdJUGb2TJfufqAPm+/3gdi6XY=";
+    })
+  ];
+
   # ldflags based on metadata from git and source
   preBuild = ''
     ldflags+=" -X ${config-module}.Commit=$(cat COMMIT)"
@@ -45,7 +55,7 @@ buildGoModule rec {
     installShellFiles
   ];
 
-  vendorHash = "sha256-NEKHTSLEF8jBSmAnHq/q+kyV8vPz3DTNj4Jquf5rnso=";
+  vendorHash = "sha256-qkfJo+QGqcqiZMLuWbj0CpgRWxbqTu6DGAW8pBu4O/0=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/py/pyp/package.nix b/pkgs/by-name/py/pyp/package.nix
index 7d0df04993d1..74fdc2f64af2 100644
--- a/pkgs/by-name/py/pyp/package.nix
+++ b/pkgs/by-name/py/pyp/package.nix
@@ -1,55 +1,49 @@
 {
   lib,
-  bc,
+  python3Packages,
   fetchFromGitHub,
+
+  # tests
+  addBinToPathHook,
+  bc,
   jq,
-  python3,
+  versionCheckHook,
 }:
 
 let
-  pythonPackages = python3.pkgs;
   finalAttrs = {
     pname = "pyp";
-    version = "1.2.0";
+    version = "1.3.0";
 
     src = fetchFromGitHub {
       owner = "hauntsaninja";
       repo = "pyp";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8=";
+      hash = "sha256-u9yxjYNQrtYtFtUh5tTJ1mGmGB+Ry+FRupli8RzRu3c=";
     };
 
     pyproject = true;
 
-    build-system = with pythonPackages; [
+    build-system = with python3Packages; [
       flit-core
     ];
 
     nativeCheckInputs =
-      (with pythonPackages; [
+      (with python3Packages; [
         pytestCheckHook
       ])
       ++ [
+        addBinToPathHook
         bc
         jq
+        versionCheckHook
       ];
+    versionCheckProgramArg = "--version";
 
     pythonImportsCheck = [
       "pyp"
     ];
 
-    # without this, the tests fail because they are unable to find the pyp tool
-    # itself...
-    preCheck = ''
-      _OLD_PATH_=$PATH
-      PATH=$out/bin:$PATH
-    '';
-
-    # And a cleanup!
-    postCheck = ''
-      PATH=$_OLD_PATH_
-    '';
-
     meta = {
       homepage = "https://github.com/hauntsaninja/pyp";
       description = "Easily run Python at the shell";
@@ -62,4 +56,4 @@ let
     };
   };
 in
-pythonPackages.buildPythonPackage finalAttrs
+python3Packages.buildPythonPackage finalAttrs
diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index bc9e895058f8..7d9e668f9626 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 = "8.3.2";
+  version = "8.3.3";
 
   src = fetchurl {
     url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-5yaV+ehcamXIVQZvte2+yUd0FoseR2kFuhvzZb3SZY8=";
+    hash = "sha256-C3lhEgg9erAYSV4qU+xqPM1YbqCIj7mqmVzu+6BY+pI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/randoop/package.nix b/pkgs/by-name/ra/randoop/package.nix
index f3e78214ef70..874494e71b6b 100644
--- a/pkgs/by-name/ra/randoop/package.nix
+++ b/pkgs/by-name/ra/randoop/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.3.3";
+  version = "4.3.4";
   pname = "randoop";
 
   src = fetchurl {
     url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
-    sha256 = "sha256-x9kAoVa4wvUp3gpg9GCodvjwql3CBtn5EqJIZYSSqVI=";
+    sha256 = "sha256-yzQw9l3uAq51SHXJ4rsZNRCiFdhOEoSrwv9iPvD2i9c=";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/by-name/rc/rcon-cli/package.nix b/pkgs/by-name/rc/rcon-cli/package.nix
new file mode 100644
index 000000000000..1080d7ed1dc4
--- /dev/null
+++ b/pkgs/by-name/rc/rcon-cli/package.nix
@@ -0,0 +1,33 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "rcon-cli";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "itzg";
+    repo = "rcon-cli";
+    tag = finalAttrs.version;
+    hash = "sha256-1dexjVfbqTzq9RLhVPn0gRcdJTa/AFj8BiQLoD0/L5c=";
+  };
+
+  vendorHash = "sha256-xq1Z6cgUqXXVzc/j54Nul6xAXa5gKh3NeenQoMW+Xpg=";
+  subPackages = [ "." ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Little RCON cli based on james4k's RCON library for golang";
+    homepage = "https://github.com/itzg/rcon-cli";
+    changelog = "https://github.com/itzg/rcon-cli/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      link00000000
+    ];
+    mainProgram = "rcon-cli";
+  };
+})
diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix
index 71ee20681b9c..3e8044c08a59 100644
--- a/pkgs/by-name/rd/rdma-core/package.nix
+++ b/pkgs/by-name/rd/rdma-core/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rdma-core";
-  version = "57.0";
+  version = "58.0";
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vE0HKsNQNB+Nfxh7BNGadweZQC+e8HFbI89iJhSg40o=";
+    hash = "sha256-dCaxZeGmnf46XI0RZjVWy1JsQjpdCw63lbe2RkWNwQs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 72de15a93131..567972ba2f58 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.04.00";
+  version = "05.04.01";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-O+rAXUl5vEBEl/S3FvBzofbcydFul0mF5NhT2Fzf6n8=";
+    hash = "sha256-PTaEGRYZS+yBINwP7EJE4NfgGpB1RTOsDNtzxljZYZA=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index b9fff9999b90..ad348276e3ef 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "40.48.0";
+  version = "40.60.0";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-SZKa1jIK5FIh8t/aH2o3kgSfqgNR9+rk7GzMX0Fs2dk=";
+    hash = "sha256-eF9RY/KmiyFjGgEm1twxZliKMS5+7sXF5f2JpUYvJCM=";
   };
 
   postPatch = ''
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-BjMJzITAeUspL0a/ZfhejmOdEVi6pBHD6BmQt2WIE1I=";
+    hash = "sha256-X9hwB4E78puo+1hkGoKwOSK3xhGOpcXciC2h6mElvWY=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;
diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix
index cd3d3fb2a700..559d14d77616 100644
--- a/pkgs/by-name/rm/rmenu/package.nix
+++ b/pkgs/by-name/rm/rmenu/package.nix
@@ -1,4 +1,5 @@
 {
+  cmake,
   fetchFromGitHub,
   glib,
   gtk3,
@@ -7,22 +8,26 @@
   networkmanager,
   pkg-config,
   rustPlatform,
+  versionCheckHook,
   webkitgtk_4_1,
   wrapGAppsHook3,
+  xdotool,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "rmenu";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    tag = "v${version}";
     owner = "imgurbot12";
     repo = "rmenu";
-    hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4=";
+    hash = "sha256-cmuB7JfHQuDFo8YaenTDwpe+TxKFaoJM5YwrT7eAfPM=";
   };
 
   nativeBuildInputs = [
     pkg-config
+    cmake
     wrapGAppsHook3
   ];
 
@@ -32,19 +37,19 @@ rustPlatform.buildRustPackage rec {
     libsoup_3
     networkmanager
     webkitgtk_4_1
+    xdotool
   ];
 
   strictDeps = true;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9sKcvVN14gfR30FvF8/esdJoIbSgHUl/aHRBWA8DRWg=";
+  cargoHash = "sha256-FIlFy3/Hih40My5fTykYjvaQEmnB3ZC5vX3lfKdW9Gk=";
 
   postInstall = ''
     # copy themes and plugins
-    mkdir $out/themes
-    mkdir $out/plugins
-    cp -vfr $src/themes/* $out/themes/.
-    cp -vfr $src/other-plugins/* $out/plugins/.
+    mkdir -p $out/themes $out/plugins/css
+    cp -vfr $src/themes/* $out/themes
+    cp -vfr $src/plugins/misc/* $out/plugins
     mv $out/bin/* $out/plugins # everything is a plugin by default
 
     # rmenu and rmenu-build are actual binaries
@@ -52,16 +57,16 @@ rustPlatform.buildRustPackage rec {
     mv $out/plugins/rmenu-build $out/bin/rmenu-build
 
     # fix plugin names
-    # desktop  network  pactl-audio.sh  powermenu.sh  run  window
-    mv $out/plugins/run $out/plugins/rmenu-run
-    mv $out/plugins/desktop $out/plugins/rmenu-desktop
-    mv $out/plugins/network $out/plugins/rmenu-network
-    mv $out/plugins/window $out/plugins/rmenu-window
+    # desktop  network  pactl-audio.sh  powermenu.sh  run  window  emoji  search
+    for plugin in desktop emoji files network run search window ; do
+      mv $out/plugins/$plugin $out/plugins/rmenu-$plugin
+    done
 
     # fix config and theme
     mkdir -p $out/share/rmenu
     cp -vf $src/rmenu/public/config.yaml $out/share/rmenu/config.yaml
-    substituteInPlace $out/share/rmenu/config.yaml --replace "~/.config/rmenu" "$out"
+    cp -vf $src/plugins/emoji/css/* $out/plugins/css
+    substituteInPlace $out/share/rmenu/config.yaml --replace-fail "~/.config/rmenu" "$out"
     ln -sf  $out/themes/dark.css $out/share/rmenu/style.css
   '';
 
@@ -75,6 +80,11 @@ rustPlatform.buildRustPackage rec {
     )
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://github.com/imgurbot12/rmenu/releases/tag/v${version}";
     description = "Another customizable Application-Launcher written in Rust";
diff --git a/pkgs/by-name/ro/rosegarden/package.nix b/pkgs/by-name/ro/rosegarden/package.nix
index 002b5e24bdc9..eea5928db436 100644
--- a/pkgs/by-name/ro/rosegarden/package.nix
+++ b/pkgs/by-name/ro/rosegarden/package.nix
@@ -31,11 +31,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rosegarden";
-  version = "24.12.1";
+  version = "25.06";
 
   src = fetchurl {
     url = "mirror://sourceforge/rosegarden/${pname}-${version}.tar.xz";
-    sha256 = "sha256-VmltXEu7Qn7lViT2ICn+6zJlzDSlFG6P69evRRX0iTI=";
+    sha256 = "sha256-df5SsAWJlHHMSw5JVL5dNe4c6PQWWauO9IomF4qlw20=";
   };
 
   postPhase = ''
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index 728f6b4653fe..bd213cdf5baa 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -47,24 +47,6 @@
     "hash": "sha256-BsXNOWEgfFq3Yz7VTtK6m/ov4/erRqyBzieWSIpmc1U=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/9.0.0/microsoft.bcl.asyncinterfaces.9.0.0.nupkg"
   },
-  {
-    "pname": "Microsoft.Bcl.HashCode",
-    "version": "1.1.1",
-    "hash": "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.hashcode/1.1.1/microsoft.bcl.hashcode.1.1.1.nupkg"
-  },
-  {
-    "pname": "Microsoft.Build",
-    "version": "17.11.4",
-    "hash": "sha256-y2qkHCwPbRYZKXwmABQUNhEHHQB/67xSH1zq8fz9olo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.11.4/microsoft.build.17.11.4.nupkg"
-  },
-  {
-    "pname": "Microsoft.Build",
-    "version": "17.13.9",
-    "hash": "sha256-rS0qX48D/t6YLJ+PbI6fmZKkCz8VSLHAZOGDsGpGbu8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.13.9/microsoft.build.17.13.9.nupkg"
-  },
   {
     "pname": "Microsoft.Build",
     "version": "17.3.4",
@@ -95,36 +77,12 @@
     "hash": "sha256-hOFFiQiCNkkDqt0Ad/4Y/sggj4t0zWXmfGjE+I/cqqM=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"
   },
-  {
-    "pname": "Microsoft.Build.Tasks.Core",
-    "version": "17.11.4",
-    "hash": "sha256-Y1A6j3uuYVrjM+waJ4/AKNgiGGqZU3Cai3swu8FUtqM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.11.4/microsoft.build.tasks.core.17.11.4.nupkg"
-  },
-  {
-    "pname": "Microsoft.Build.Tasks.Core",
-    "version": "17.13.9",
-    "hash": "sha256-ZF6MaW4TIGGgqMqr78f7XrY4ZuoxTyaDi8EMLNMiV5I=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.13.9/microsoft.build.tasks.core.17.13.9.nupkg"
-  },
   {
     "pname": "Microsoft.Build.Tasks.Core",
     "version": "17.3.4",
     "hash": "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs=",
     "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg"
   },
-  {
-    "pname": "Microsoft.Build.Utilities.Core",
-    "version": "17.11.4",
-    "hash": "sha256-1hfIxI2oIHDH1HUotX4l4SFzWerkjoCYSFYUcW0SF5g=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.11.4/microsoft.build.utilities.core.17.11.4.nupkg"
-  },
-  {
-    "pname": "Microsoft.Build.Utilities.Core",
-    "version": "17.13.9",
-    "hash": "sha256-B1+u6sdrkwz3b5JLZ42BHkFRvPKRGyMWWUt44Fyb9Zo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.13.9/microsoft.build.utilities.core.17.13.9.nupkg"
-  },
   {
     "pname": "Microsoft.Build.Utilities.Core",
     "version": "17.3.4",
@@ -193,15 +151,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "9.0.0-beta.25263.2",
-    "hash": "sha256-mFVYybJiMi58vu+hT4VfXgWCWAXGeKxI7OwUQi2FO/A=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25263.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.25263.2.nupkg"
+    "version": "9.0.0-beta.25271.1",
+    "hash": "sha256-Kk4iy7AcCfJ4BOcAEyRuFQ+pFF1zjL+1c+UaU/SKRv4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25271.1/microsoft.dotnet.arcade.sdk.9.0.0-beta.25271.1.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "9.0.0-beta.25263.2",
-    "hash": "sha256-J86joC1OMlnjMppEBf9GwEbc0IdVJ/XjshBiZunH/EU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25263.2/microsoft.dotnet.xlifftasks.9.0.0-beta.25263.2.nupkg"
+    "version": "9.0.0-beta.25271.1",
+    "hash": "sha256-Pt1JWrowN7AgRijTpkk0OMi/DGGJxN9Dd+eobMev/Do=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25271.1/microsoft.dotnet.xlifftasks.9.0.0-beta.25271.1.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -287,18 +245,6 @@
     "hash": "sha256-IaATAy1M/MEBTid0mQiTrHj4aTwo2POCtckxSbLc3lU=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.1/microsoft.io.redist.6.0.1.nupkg"
   },
-  {
-    "pname": "Microsoft.NET.StringTools",
-    "version": "17.11.4",
-    "hash": "sha256-lWfzY35WQ+iKS9TpuztDTljgF9CIORhFhFEm0p1dVBE=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.11.4/microsoft.net.stringtools.17.11.4.nupkg"
-  },
-  {
-    "pname": "Microsoft.NET.StringTools",
-    "version": "17.13.9",
-    "hash": "sha256-E3bKeMbBLabLM3GWPmD4HDjJzS3Ru1KcPTRWHugRgrQ=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.13.9/microsoft.net.stringtools.17.13.9.nupkg"
-  },
   {
     "pname": "Microsoft.NET.StringTools",
     "version": "17.6.3",
@@ -385,9 +331,9 @@
   },
   {
     "pname": "Microsoft.VisualStudio.SolutionPersistence",
-    "version": "1.0.28",
-    "hash": "sha256-7BmeidGDb19wfvpaYA91luCFE1CStb8iLlnyJhVCJ6w=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.solutionpersistence/1.0.28/microsoft.visualstudio.solutionpersistence.1.0.28.nupkg"
+    "version": "1.0.52",
+    "hash": "sha256-KZGPtOXe6Hv8RrkcsgoLKTRyaCScIpQEa2NhNB3iOXw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.solutionpersistence/1.0.52/microsoft.visualstudio.solutionpersistence.1.0.52.nupkg"
   },
   {
     "pname": "Microsoft.VisualStudio.Telemetry",
@@ -899,12 +845,6 @@
     "hash": "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.0/system.formats.asn1.8.0.0.nupkg"
   },
-  {
-    "pname": "System.Formats.Nrbf",
-    "version": "9.0.0",
-    "hash": "sha256-c4qf6CocQUZB0ySGQd8s15PXY7xfrjQqMGXxkwytKyw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.nrbf/9.0.0/system.formats.nrbf.9.0.0.nupkg"
-  },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
@@ -1025,24 +965,12 @@
     "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/9.0.0/system.reflection.metadata.9.0.0.nupkg"
   },
-  {
-    "pname": "System.Reflection.MetadataLoadContext",
-    "version": "8.0.0",
-    "hash": "sha256-jS5XPZiHjY2CJFnLSxL6U7lMrU3ZknvB4EOgMbG0LEo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/8.0.0/system.reflection.metadataloadcontext.8.0.0.nupkg"
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"
   },
-  {
-    "pname": "System.Resources.Extensions",
-    "version": "9.0.0",
-    "hash": "sha256-y2gLEMuAy6QfEyNJxABC/ayMWGnwlpX735jsUQLktho=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/9.0.0/system.resources.extensions.9.0.0.nupkg"
-  },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
@@ -1097,12 +1025,6 @@
     "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ=",
     "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/9.0.0/system.security.cryptography.protecteddata.9.0.0.nupkg"
   },
-  {
-    "pname": "System.Security.Cryptography.Xml",
-    "version": "8.0.0",
-    "hash": "sha256-XSg8r9TBoYi6KF10Tg3HyCN3pTm1pA2v0BonEgu+PXU=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/8.0.0/system.security.cryptography.xml.8.0.0.nupkg"
-  },
   {
     "pname": "System.Security.Principal",
     "version": "4.3.0",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 60c5cb3b1360..651269965234 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -32,18 +32,18 @@ in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.80.16";
+  vsVersion = "2.82.12";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-4kFu0bxbLZ31ifGluSrN9sN5EwzLg3bVHnh9iB9TGpA=";
+    hash = "sha256-5QCiA2NxjWUFLut8gxboR2kTibN66QCxbe2g2jdrINo=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.0.0-1.25266.2";
+  version = "5.0.0-1.25302.10";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/sa/safecopy/package.nix b/pkgs/by-name/sa/safecopy/package.nix
index 14cc7418a8ef..530f596a5435 100644
--- a/pkgs/by-name/sa/safecopy/package.nix
+++ b/pkgs/by-name/sa/safecopy/package.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
 
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.bluescreen303 ];
     mainProgram = "safecopy";
   };
 }
diff --git a/pkgs/by-name/sa/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
index a480159d34c2..525b3a901722 100644
--- a/pkgs/by-name/sa/sage/sage-env.nix
+++ b/pkgs/by-name/sa/sage/sage-env.nix
@@ -102,6 +102,12 @@ in
 writeTextFile rec {
   name = "sage-env";
   destination = "/${name}";
+
+  passthru = {
+    lib = sagelib;
+    docbuild = sage-docbuild;
+  };
+
   text =
     ''
       export PKG_CONFIG_PATH='${
@@ -205,8 +211,3 @@ writeTextFile rec {
           }''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
       '';
 }
-// {
-  # equivalent of `passthru`, which `writeTextFile` doesn't support
-  lib = sagelib;
-  docbuild = sage-docbuild;
-}
diff --git a/pkgs/by-name/sa/sarabun-font/package.nix b/pkgs/by-name/sa/sarabun-font/package.nix
index 34b624bc8ebd..34089c8f5cad 100644
--- a/pkgs/by-name/sa/sarabun-font/package.nix
+++ b/pkgs/by-name/sa/sarabun-font/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "sarabun";
-  version = "unstable-2018-08-24";
+  version = "0-unstable-2018-08-24";
 
   src = fetchFromGitHub {
     owner = "cadsondemak";
@@ -20,11 +20,12 @@ stdenv.mkDerivation {
     "doc"
   ];
 
-  buildPhase = ''
+  installPhase = ''
+    runHook preInstall
     mkdir -p $doc/sarabun $out/share/fonts/truetype
-
     cp -r $src/OFL.txt $src/docs/* $doc/sarabun
     cp $src/fonts/*.ttf $out/share/fonts/truetype
+    runHook postInstall
   '';
 
   meta = {
diff --git a/pkgs/by-name/sc/scorecard/package.nix b/pkgs/by-name/sc/scorecard/package.nix
index e382f0aa6805..18bbdac33a2b 100644
--- a/pkgs/by-name/sc/scorecard/package.nix
+++ b/pkgs/by-name/sc/scorecard/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "scorecard";
-  version = "5.1.1";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "ossf";
     repo = "scorecard";
     tag = "v${version}";
-    hash = "sha256-6lJ+duP/gTC2xIIWbLL0hx2UYS/no4vd8pqTDR18G8Y=";
+    hash = "sha256-7py6qkal1tNQ2NAi/SiYIEe03NV7INAQRPZ9z5LsusI=";
     # populate values otherwise taken care of by goreleaser,
     # unfortunately these require us to use git. By doing
     # this in postFetch we can delete .git afterwards and
@@ -33,9 +33,9 @@ buildGoModule rec {
   };
   vendorHash =
     if stdenv.hostPlatform.isLinux then
-      "sha256-zWMmbC0lkjlIwrfq3ql0+ndn/4y/PW92TgTiUYfEn0M="
+      "sha256-h78551OfEJTB3Fghc1nIHcfiHp7ygtZgHXpwp1OaFgY="
     else
-      "sha256-/AtW36Pl5W+WNVCKhC0WMwYS848MUvAaKdm+i8t88D8=";
+      "sha256-MTB5ejc4/ivbkp9ytCF+wGvvt+njTkMb1ijVsh5uLps=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
index 0024c9c74e2d..d674528ca532 100644
--- a/pkgs/by-name/se/seaweedfs/package.nix
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "seaweedfs";
-  version = "3.89";
+  version = "3.91";
 
   src = fetchFromGitHub {
     owner = "seaweedfs";
     repo = "seaweedfs";
     rev = version;
-    hash = "sha256-qIbqgcm+qqmbKU+BZ9wrKW16yH7qz5WPijtGz2pusNg=";
+    hash = "sha256-wKllXSOYxBtWrncTXa/nXYVke9ZNDL8QND5Sk5gmJW4=";
   };
 
-  vendorHash = "sha256-Y1ST5wKIkVKOhNVV1V9eDZ5DupQNm9mcA90Kqt3dQYQ=";
+  vendorHash = "sha256-6qMBiXYSpv6ibuH0Ro8y72a2cIdB9RMuD6j/E8ILkvs=";
 
   subPackages = [ "weed" ];
 
diff --git a/pkgs/by-name/sh/shadowenv/package.nix b/pkgs/by-name/sh/shadowenv/package.nix
index f4eec683b660..ccde675348ab 100644
--- a/pkgs/by-name/sh/shadowenv/package.nix
+++ b/pkgs/by-name/sh/shadowenv/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shadowenv";
-  version = "3.0.3";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "shadowenv";
     rev = version;
-    hash = "sha256-ZipFcwTpKKFnQWOPxXg07V71jitG0NSLpGLEzUSsUFA=";
+    hash = "sha256-s70tNeF0FnWYZ0xLGIL1lTM0LwJdhPPIHrNgrY1YNBs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KNCucBmYVmIQ/XY+UNV667iWLyiEJDnP/8gAmUHGY+0=";
+  cargoHash = "sha256-Cg01yM3FbrYpZrv2dhGJnezugNhcuwDcXIU47/AWrC4=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 0f7a41cc1690..629c83878b9b 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -26,13 +26,13 @@ assert
   (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
 buildNpmPackage rec {
   pname = "sitespeed-io";
-  version = "37.6.0";
+  version = "37.8.0";
 
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
     tag = "v${version}";
-    hash = "sha256-sR6vDLoMysdcbtaIrNUvzwhIPe0GbymHdKQkFDBaEiM=";
+    hash = "sha256-0bXkVqCen0kUHP8YeFkpdxTd+4Hx6YMZVTjwgWWg6nQ=";
   };
 
   postPatch = ''
@@ -50,7 +50,7 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
   npmInstallFlags = [ "--omit=dev" ];
-  npmDepsHash = "sha256-6Q8ed8iIGVOUNIn7gMEgqK8fqF5dI2fO/j5u7hj3hGA=";
+  npmDepsHash = "sha256-ZWjlueRZkH5lsalUY/xoOO/22P9Ta5CnmK0UKjapyU8=";
 
   postInstall = ''
     mv $out/bin/sitespeed{.,-}io
diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 76165cd5e43c..888ebb584a15 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -9,15 +9,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-viewer";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-Yez8GbER6ylkozQP5oQ0m0u+x/T5qQVPRt0S/NRFT60=";
+    hash = "sha256-RFOKraBiAqhVH/3nSVEqhR4Gfxr4qJet+yYUrf4/ZzA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vWTj6cJgvg10NaLw9WfHXmiG8hg7mUIH/Gj3JVvWCuA=";
+  cargoHash = "sha256-gyE7CozFDUEwv87bSQJYyb07nQOHNAyHg7nFgBdhRx4=";
 
   buildInputs = [
     qt6.qtbase
@@ -38,6 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Viewer for .slint files from the Slint Project";
     mainProgram = "slint-viewer";
     homepage = "https://crates.io/crates/slint-viewer";
+    changelog = "https://github.com/slint-ui/slint/blob/master/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ dtomvan ];
diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 3d6619a07953..b6d12ac41cae 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -14,7 +14,7 @@
 
 python312Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.9.2";
+  version = "8.9.4";
 
   pyproject = true;
 
@@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-4Dv2q/aKWnQkQ6ANYev/5fT1fFKh1MytYJtHK0iAzhk=";
+    hash = "sha256-iiz+sVncztaCNndU+4YMhxECw7R6ks+25apRnd0WgyM=";
   };
 
   patches = [
@@ -111,6 +111,7 @@ python312Packages.buildPythonApplication rec {
     "docutils"
     "jsonschema"
     "pygit2"
+    "requests"
     "urllib3"
     "validators"
   ];
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index 634bbb565efd..2c42c4dfdedc 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -12,8 +12,10 @@
   libsoup_3,
   openssl,
   pkg-config,
+  qt6,
   rustPlatform,
   webkitgtk_4_1,
+  wrapGAppsHook4,
   graphene,
   nix-update-script,
   versionCheckHook,
@@ -34,6 +36,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     iproute2
     pkg-config
+    qt6.wrapQtAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
@@ -66,6 +70,12 @@ rustPlatform.buildRustPackage rec {
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
   versionCheckProgramArg = "--version";
 
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  dontWrapGApps = true;
+
   meta = {
     description = "Open source Linux client for Checkpoint VPN tunnels";
     homepage = "https://github.com/ancwrd1/snx-rs";
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index 54bff729de14..f0c60006a00d 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -36,7 +36,7 @@
   soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
 }:
 let
-  version = "0.31.0";
+  version = "0.32.1";
   pname = "space-station-14-launcher";
 in
 buildDotnetModule rec {
@@ -50,7 +50,7 @@ buildDotnetModule rec {
     owner = "space-wizards";
     repo = "SS14.Launcher";
     rev = "v${version}";
-    hash = "sha256-lEgJ+GdmiSQMl/l+CTBIUevMcJi+yVvFuS3buTNCYW4=";
+    hash = "sha256-Es+DBwWh2QxCev+Aepi8ItTXSYIgNgb05zdScOBZNJs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/sp/spice-protocol/package.nix b/pkgs/by-name/sp/spice-protocol/package.nix
index 88d12a7ff1cb..7abb0ab672c0 100644
--- a/pkgs/by-name/sp/spice-protocol/package.nix
+++ b/pkgs/by-name/sp/spice-protocol/package.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     description = "Protocol headers for the SPICE protocol";
     homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ bluescreen303 ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/sp/spice/package.nix b/pkgs/by-name/sp/spice/package.nix
index d3a4c9df6a08..f70b1c85b0c3 100644
--- a/pkgs/by-name/sp/spice/package.nix
+++ b/pkgs/by-name/sp/spice/package.nix
@@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
 
     maintainers = with maintainers; [
-      bluescreen303
       atemu
     ];
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/by-name/sp/spral/package.nix b/pkgs/by-name/sp/spral/package.nix
index e8376d81e716..885fe73d12d0 100644
--- a/pkgs/by-name/sp/spral/package.nix
+++ b/pkgs/by-name/sp/spral/package.nix
@@ -1,50 +1,66 @@
 {
-  blas,
-  fetchFromGitHub,
-  gfortran,
-  lapack,
+  config,
   lib,
-  llvmPackages,
-  meson,
-  metis,
-  ninja,
+
+  fetchFromGitHub,
   stdenv,
+
+  nix-update-script,
+
+  enableCuda ? config.cudaSupport,
+
+  # nativeBuildInputs
+  cudaPackages,
+  gfortran,
+  meson,
+  ninja,
+  pkg-config,
+
+  # buildInputs
+  blas,
+  hwloc,
+  lapack,
+  llvmPackages,
+  metis,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spral";
-  version = "2025.01.08";
+  version = "2025.05.20";
 
   src = fetchFromGitHub {
     owner = "ralna";
     repo = "spral";
-    rev = "v${version}";
-    hash = "sha256-tuhJClSjah/ud6PVr6biOq5KdKtspJ7hpWZ350yzz+U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9QEcAOFB3CtGNqr8LoDaj2vP3KMONlUVooeXECtGsxc=";
   };
 
-  postPatch =
-    ''
-      # Skipped test: ssidst
-      # hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
-      substituteInPlace tests/meson.build --replace-fail \
-        "subdir('ssids')" \
-        ""
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # Skipped test: lsmrt, segfault
-      substituteInPlace tests/meson.build --replace-fail \
-        "['lsmrt', files('lsmr.f90')]," \
-        ""
-    '';
+  # Ignore a failing test on darwin
+  # ref. https://github.com/ralna/spral/issues/258
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace tests/ssids/meson.build --replace-fail \
+      "spral_tests += [['ssids', 'ssidst', files('ssids.f90')]]" ""
+  '';
 
-  nativeBuildInputs = [
-    gfortran
-    meson
-    ninja
+  nativeBuildInputs =
+    [
+      gfortran
+      meson
+      ninja
+      pkg-config
+    ]
+    ++ lib.optionals enableCuda [
+      cudaPackages.cuda_nvcc
+    ];
+
+  propagatedBuildInputs = lib.optionals enableCuda [
+    cudaPackages.cuda_cudart
+    cudaPackages.libcublas
   ];
 
   buildInputs = [
     blas
+    (hwloc.override { inherit enableCuda; })
     lapack
     metis
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ];
@@ -55,11 +71,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Sparse Parallel Robust Algorithms Library";
     homepage = "https://github.com/ralna/spral";
-    changelog = "https://github.com/ralna/spral/blob/${src.rev}/ChangeLog";
+    changelog = "https://github.com/ralna/spral/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ nim65s ];
   };
-}
+})
diff --git a/pkgs/by-name/sq/sqlitestudio-plugins/package.nix b/pkgs/by-name/sq/sqlitestudio-plugins/package.nix
new file mode 100644
index 000000000000..71ba50a2c3e8
--- /dev/null
+++ b/pkgs/by-name/sq/sqlitestudio-plugins/package.nix
@@ -0,0 +1,35 @@
+{
+  stdenv,
+  lib,
+  python3,
+
+  sqlitestudio,
+}:
+stdenv.mkDerivation {
+  pname = "sqlitestudio-plugins";
+
+  inherit (sqlitestudio)
+    version
+    src
+    nativeBuildInputs
+    buildInputs
+    ;
+
+  postConfigure = ''
+    uic ./SQLiteStudio3/guiSQLiteStudio/mainwindow.ui -o ./SQLiteStudio3/guiSQLiteStudio/ui_mainwindow.h
+  '';
+
+  qmakeFlags = [
+    "./Plugins"
+    "PYTHON_VERSION=${python3.pythonVersion}"
+    "INCLUDEPATH+=${python3}/include/python${python3.pythonVersion}"
+  ];
+
+  # bin/ld: final link failed: bad value
+  enableParallelBuilding = false;
+
+  meta = sqlitestudio.meta // {
+    description = "Official plugins for SQLiteStudio, a free, open source, multi-platform SQLite database manager";
+    badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ];
+  };
+}
diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index 9972a052e431..7131d99b8fd4 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -8,6 +8,9 @@
   python3,
   copyDesktopItems,
   makeDesktopItem,
+
+  sqlitestudio-plugins,
+  includeOfficialPlugins ? lib.meta.availableOn stdenv.hostPlatform sqlitestudio-plugins,
 }:
 stdenv.mkDerivation rec {
   pname = "sqlitestudio";
@@ -41,7 +44,14 @@ stdenv.mkDerivation rec {
       qtscript
     ]);
 
-  qmakeFlags = [ "./SQLiteStudio3" ];
+  qmakeFlags =
+    [
+      "./SQLiteStudio3"
+      "DEFINES+=NO_AUTO_UPDATES"
+    ]
+    ++ lib.optionals includeOfficialPlugins [
+      "DEFINES+=PLUGINS_DIR=${sqlitestudio-plugins}/lib/sqlitestudio"
+    ];
 
   desktopItems = [
     (makeDesktopItem {
@@ -67,7 +77,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Free, open source, multi-platform SQLite database manager";
     homepage = "https://sqlitestudio.pl/";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     mainProgram = "sqlitestudio";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ asterismono ];
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index 103eea30bb3b..b6c4f1f7c257 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   curl,
   pkg-config,
   makeBinaryWrapper,
+  installShellFiles,
   libgit2,
   oniguruma,
   openssl,
@@ -34,6 +36,7 @@ rustPlatform.buildRustPackage {
     makeBinaryWrapper
     pkg-config
     rustPlatform.bindgenHook
+    installShellFiles
   ];
 
   buildInputs = [
@@ -68,19 +71,26 @@ rustPlatform.buildRustPackage {
   # Tests are disabled since they always fail when building with Nix
   doCheck = false;
 
-  postInstall = ''
-    mkdir -p $out/lib/steel
+  postInstall =
+    ''
+      mkdir -p $out/lib/steel
 
-    substituteInPlace cogs/installer/download.scm \
-      --replace-fail '"cargo-steel-lib"' '"$out/bin/cargo-steel-lib"'
+      substituteInPlace cogs/installer/download.scm \
+        --replace-fail '"cargo-steel-lib"' '"$out/bin/cargo-steel-lib"'
 
-    pushd cogs
-    $out/bin/steel install.scm
-    popd
+      pushd cogs
+      $out/bin/steel install.scm
+      popd
 
-    mv $out/lib/steel/bin/repl-connect $out/bin
-    rm -rf $out/lib/steel/bin
-  '';
+      mv $out/lib/steel/bin/repl-connect $out/bin
+      rm -rf $out/lib/steel/bin
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd steel \
+        --bash <($out/bin/steel completions bash) \
+        --fish <($out/bin/steel completions fish) \
+        --zsh <($out/bin/steel completions zsh)
+    '';
 
   postFixup = ''
     wrapProgram $out/bin/steel --set-default STEEL_HOME "$out/lib/steel"
diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix
index 210a3f62ad4c..e76be7a5629c 100644
--- a/pkgs/by-name/st/stereotool/package.nix
+++ b/pkgs/by-name/st/stereotool/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation rec {
   pname = "stereotool";
-  version = "10.41";
+  version = "10.51";
 
   srcs =
     let
@@ -37,19 +37,19 @@ stdenv.mkDerivation rec {
           (fetchurl {
             name = "alsa";
             url = "https://download.thimeo.com/stereo_tool_gui_64_${versionNoPoint}";
-            hash = "sha256-v+e24IHcGBEu/jHw52tzxxb9F7V39N7XYQt0Ln5YAP8=";
+            hash = "sha256-sMgqbfJhIBuYf6nvxs4R/XmiOBHnVOp2ORcU5+CNtLM=";
           })
           # Jack version for 64bits.
           (fetchurl {
             name = "jack";
             url = "https://download.thimeo.com/stereo_tool_gui_jack_64_${versionNoPoint}";
-            hash = "sha256-v+e24IHcGBEu/jHw52tzxxb9F7V39N7XYQt0Ln5YAP8=";
+            hash = "sha256-sMgqbfJhIBuYf6nvxs4R/XmiOBHnVOp2ORcU5+CNtLM=";
           })
           # Cmd version for 64bits
           (fetchurl {
             name = "cmd";
             url = "https://download.thimeo.com/stereo_tool_cmd_64_${versionNoPoint}";
-            hash = "sha256-jYxmwh7L4XCDnhj+hTAGTlm7rjanUk76CtXmhFS8vPU=";
+            hash = "sha256-x+2JwIy2uLx+QfjayOhY+MYYEQYvAt5O7y+KWn3jcVU=";
           })
         ];
         # Sources if the system is aarch64-linux
@@ -57,17 +57,17 @@ stdenv.mkDerivation rec {
           (fetchurl {
             name = "alsa";
             url = "https://download.thimeo.com/stereo_tool_gui_pi2_64_${versionNoPoint}";
-            hash = "sha256-zKRum8jU5tqgpDjs6ZY0aUnoRXi+tfyOi9ZZDUIGhi4=";
+            hash = "sha256-Gb0YPgEsd7xvvcCL+MC9ZFAsh0ciJOsmJn1ZIdkZw7Q=";
           })
           (fetchurl {
             name = "jack";
             url = "https://download.thimeo.com/stereo_tool_gui_jack_pi2_64_${versionNoPoint}";
-            hash = "sha256-zKRum8jU5tqgpDjs6ZY0aUnoRXi+tfyOi9ZZDUIGhi4=";
+            hash = "sha256-Gb0YPgEsd7xvvcCL+MC9ZFAsh0ciJOsmJn1ZIdkZw7Q=";
           })
           (fetchurl {
             name = "cmd";
             url = "https://download.thimeo.com/stereo_tool_pi2_64_${versionNoPoint}";
-            hash = "sha256-Z/xfNKN8GxHJ+9OoHw76JWmTWClz0ZJxtwlmg+8wZ3A=";
+            hash = "sha256-KA69G6Vknx8Sle8f2O+OjO88ZYGSv4khYrWIsoHVAoc=";
           })
         ];
         # Sources if the system is aarch32-linux
@@ -75,17 +75,17 @@ stdenv.mkDerivation rec {
           (fetchurl {
             name = "alsa";
             url = "https://download.thimeo.com/stereo_tool_gui_pi2_${versionNoPoint}";
-            hash = "sha256-DHsWEr7k+QVwkoKndkuDEGDKcH0jGikESfg/5qREjdE=";
+            hash = "sha256-vjZ/nB4tZ7YVYmclX0Uukgx/JwTv6jjdAfYjloo7a8E=";
           })
           (fetchurl {
             name = "jack";
             url = "https://download.thimeo.com/stereo_tool_gui_jack_pi2_${versionNoPoint}";
-            hash = "sha256-DHsWEr7k+QVwkoKndkuDEGDKcH0jGikESfg/5qREjdE=";
+            hash = "sha256-vjZ/nB4tZ7YVYmclX0Uukgx/JwTv6jjdAfYjloo7a8E=";
           })
           (fetchurl {
             name = "cmd";
             url = "https://download.thimeo.com/stereo_tool_pi2_${versionNoPoint}";
-            hash = "sha256-fL8nlmp8ZFvcZL9KlH2zcOrDapXMGTdP6wIQ0TxRZZE=";
+            hash = "sha256-YUCpCzv3GrQEoeyZFwOTcoHu9msciqmViboVu1LBG3g=";
           })
         ];
         # Sources if the system is 32bits i686
@@ -94,17 +94,17 @@ stdenv.mkDerivation rec {
             # The name is the name of this source in the build directory
             name = "alsa";
             url = "https://download.thimeo.com/stereo_tool_gui_${versionNoPoint}";
-            hash = "sha256-IaLNl1a3IVjlCh566xeT9UlgzHA6NEwBacTuFLrEFxs=";
+            hash = "sha256-/l/2sx3v14R83Vqvmc5AqMQzmovww7hk4kTqN2U2Mqs=";
           })
           (fetchurl {
             name = "jack";
             url = "https://download.thimeo.com/stereo_tool_gui_jack_${versionNoPoint}";
-            hash = "sha256-IaLNl1a3IVjlCh566xeT9UlgzHA6NEwBacTuFLrEFxs=";
+            hash = "sha256-/l/2sx3v14R83Vqvmc5AqMQzmovww7hk4kTqN2U2Mqs=";
           })
           (fetchurl {
             name = "cmd";
             url = "https://download.thimeo.com/stereo_tool_cmd_${versionNoPoint}";
-            hash = "sha256-oCGhxQkpT0jNwbWoBnC5nmvVrDjYmr75s3Qq+NftZy0=";
+            hash = "sha256-lPNg58u163DcWk11jbg8l77OdqX+6rVQalGmEXD674s=";
           })
         ];
       }
diff --git a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
new file mode 100644
index 000000000000..e172cf56bda6
--- /dev/null
+++ b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
@@ -0,0 +1,67 @@
+{
+  "@biomejs/cli-darwin-arm64@npm:2.0.0-beta.6": "4f83fff14fe51d58cf58167a513cc1e513e08d6b820f5039be6b5508aefb953f0a960bf7f53623acaa3dea3d5b6383050c40401754683c0ebef5cfe00c7608f3",
+  "@biomejs/cli-darwin-x64@npm:2.0.0-beta.6": "7ca6a9cd1fb606174d4db6c4913c6fce576e5c858778c2e7248b3309be073aedb8a7411ce5fb3c361e364585e2c7ae118c5356187aa266a83b68dd9256c4f686",
+  "@biomejs/cli-linux-arm64-musl@npm:2.0.0-beta.6": "802e2835c20834032871b782fc082581dcb2921bd01abfe4faa2b8cd662b2be47b35be87250c21595ec21ab917fb00b13468ff53893b54400b7c883b5506a033",
+  "@biomejs/cli-linux-arm64@npm:2.0.0-beta.6": "e025f445655d1309204682aebcf77364c0c2687c257b6aa58cf803f14e8beb3a7065ad194cb517ce98d550c496ba6573915546906ed89abfa9e470369d8e0d2e",
+  "@biomejs/cli-linux-x64-musl@npm:2.0.0-beta.6": "680dfd54cf4aaeb6485e70bddcd2211cb559ccfbf902aebccdaa8418c6b2cbeb1a68afb20ecaae9a41385ba762da10f1fafc37ae853a3cd18478640cd0ccf44d",
+  "@biomejs/cli-linux-x64@npm:2.0.0-beta.6": "dfb7e72065d438f7112d90ad66b8638abffe2b1d107cc89a46b53b745c28acef8184a03cc458bd01c4525a15e900c4fefb70b627682bdfc62c1453270e986255",
+  "@biomejs/cli-win32-arm64@npm:2.0.0-beta.6": "68d6b4c8be07632acc201dee088866eecb3562f5b4fce64e49f3e5662626ffff2e1da8ddb369e2b4c76dbd95a98a86126991459f3c57447eacb7f0d30f984b2c",
+  "@biomejs/cli-win32-x64@npm:2.0.0-beta.6": "19363ba1670072a2dd238ca45c25f0ccc3174c840be20a85d08bfa14b83b07a490f4c9f6227bd005aaa71852e1654cd2342b2ebb2eef8adac98e44c71d2806af",
+  "@esbuild/aix-ppc64@npm:0.25.5": "fb872b34a2843293dc60e809968fedf93e0d8f7174b062decffae6ba861eb56aaea0cd0aba87ba99162ceb2a690f0cde4fc29c000b52c035e40c91ec7861d43e",
+  "@esbuild/android-arm64@npm:0.25.5": "c818e799b19b5587466bf68a27b578ccaaf866c1d144573fbde7659e3fd3f555422ec3e67f5bd186a87648957d1b6e74df4f847edea7219c16979c9916f36e91",
+  "@esbuild/android-arm@npm:0.25.5": "a5384933f9f2ffcadce2be49da6ff43249fe42f32a04071316434e9f633fc20c8d4029072e9a53555620c3531045786297607b852579eee30b6dbc3bc9d98cd9",
+  "@esbuild/android-x64@npm:0.25.5": "8ce115dc7e1e6735f23b4aadb2dfca29c0abd8577ce34802ea3d017a64e388928949134fe225dfe190babdc5ec01be5fc7794eca84738cdefc12c5e3789ce43b",
+  "@esbuild/darwin-arm64@npm:0.25.5": "a009eab62f2bd284a6f2001d5e08217059186ffc16907bbe873e1de40fe9b5ed92c0db2f4c4d0dc41545838850a430c8f2f35d7bdb9cd01a1a04293acd97afca",
+  "@esbuild/darwin-x64@npm:0.25.5": "cac8021a7a0c549263e076913346b35a5bb81f76ffbc1abfad5e7b67303f013ac0c76f111bf624ea8447b327ec86c18a60c6ff307d743a2269f5d47313f5b2de",
+  "@esbuild/freebsd-arm64@npm:0.25.5": "d248e7103b7094eb4288db7c9a78b2905a25b4a957f2b945531ca88d3394f45ceca2343a7c84954734534af6159bc741eb3d5c1ed9df990f7395337a1b14192c",
+  "@esbuild/freebsd-x64@npm:0.25.5": "8a7be0740f07f5dbb3e24bf782ca6ef518a8ce9b53e5d864221722045713586d41774cbd531df97dc868b291b3b303c12e50ca8611c3cb7b5fe09a30b38285eb",
+  "@esbuild/linux-arm64@npm:0.25.5": "ce3c8fca47cf0a92148fb288eb35a5c4a4dcf7a700730b3a48fdd63c13e17c719eb6b350378203fba773477eb5be637f47a6d52c5d4ce5bdc0075ee917156006",
+  "@esbuild/linux-arm@npm:0.25.5": "cc81ea76ab86ed2a837c9da329f7c63412d288dc0aa608c8dcdf51705dc93d5b7f966a429be4896babe611074e5898c7e6c8e07ad7f50123a05478975294fbb4",
+  "@esbuild/linux-ia32@npm:0.25.5": "bfed6750923afd56148f658f6ec8995479f5115116dc212ecb9e4c556064422e22eda855177e7c02cbc945494e4db1167101918c5fa932278115db2c7025a3f6",
+  "@esbuild/linux-loong64@npm:0.25.5": "e5c20140bbbdba53f0d86dd72961ed73e6255d2ada2d3a626f390b352170605644822ad7592f695b6e520edcefe0c5f6ba19d10694b5d11d725745d9792bde01",
+  "@esbuild/linux-mips64el@npm:0.25.5": "6b3559517efd0dd1301debc7af7e275b055859c26facdda2e229b1aaab6ebea4c480a1da151c46211ee4035d95bfa7f0cdacf735b57ee99d41b69c77357310b9",
+  "@esbuild/linux-ppc64@npm:0.25.5": "a1a1af99d758efce928335637924dcd8ddec4201af51014e1f831b012d53a0a673b1e0c31036ec9e8c5a0311439283419ec8abdfc67ecb245fa7f7b653006ed0",
+  "@esbuild/linux-riscv64@npm:0.25.5": "6cd8dce6723b73e0f89898ab6cd52e0d009afdacdfc0d5529134de7b832c92c2e0421fbb5cbfc0e0c0b2b00a9b1ff2c4cdb9695b2c535ebc174960e986c727a7",
+  "@esbuild/linux-s390x@npm:0.25.5": "31b86dbc93d19eb362bad3353e65d6da771118346e723582d06c05f1b6ffad1c3765001b5215ef1e8f0c2bb29130d98815359bbc88e5c08304354d5a92e6ea94",
+  "@esbuild/linux-x64@npm:0.25.5": "f878a3e40edfd8a50de94bf982a9eaf03e636a0332af163a6c905490063aae652384fb392d4765c4338fb6f991034949c92ec768ee65c3b2fceeb494b89fe8b3",
+  "@esbuild/netbsd-arm64@npm:0.25.5": "941c5e28a63a93f19122271b5490e196db12815702c2266c6d66401b6909a4364ab889611ba81c5359624e3ce61f0505a680a1179ed9a555d1415fa1c485d75d",
+  "@esbuild/netbsd-x64@npm:0.25.5": "edbefdd88ca24a373497a7c8d1fdab418827ff89c6eee1c574159dbb4d9174552aa87753f35525a894964b77c14b012164ec5582b9f19dd4d6c1f5d45df411c7",
+  "@esbuild/openbsd-arm64@npm:0.25.5": "d44633a374c109d2fb9c678882016e3ec3d79f0c5f21a6e6fb0114ea709bc539200b037a4e3ec52304eea2f8c5957bf16c6f0a7af5cfde41b652c4bac604bba6",
+  "@esbuild/openbsd-x64@npm:0.25.5": "efc4641ea653dedc9886f0603c2e7cfc6fbe94c34d4cdaee9b060a8b9d8143d1192c45da93b3e802af2c26f72ab1ad3a3fad0e0cb297d06de55814fe83ccd32c",
+  "@esbuild/sunos-x64@npm:0.25.5": "29860663381b6098c0fda6f69235407654dfad953e83b3f9f06a270950d5c37da4ca60a4b5915b8e2606d468b560be6179870f64a22d5b046e8a930c31a7b554",
+  "@esbuild/win32-arm64@npm:0.25.5": "a77d395251c8a62ab0cec07d5230222823fa02fbf3ef008d94b5213a335c9f949872c3f1c2f947abaa28098b669018e429af42f59616e049860a0072f3b006de",
+  "@esbuild/win32-ia32@npm:0.25.5": "ff1b6cbe835082aef5b93c3e2012d51be431d05c6ae5f90a5bc89687c687e8e2340c262dedddd124b27b511616bbc4088b5a4a949d3147f677084dc6ec572629",
+  "@esbuild/win32-x64@npm:0.25.5": "266e69e8d37bd4deb77443588e49472e4e9791178cb39e1692eabb67cf65d8e85a932ac468e7ebb2072c8a9ee23ad413c8f0f7d954c474f643cedbbf7aad952a",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.11-commit.f051675": "21449eafb0fc91888fc9284702ad0c85921c4d4143ff3bbb2c8c020a919d34870d24710b25170da147178b30e5aff19bb343618ef52ccdf0066b59a7cb8db118",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.11-commit.f051675": "c2de323cb05852b4a514dde8e14bef22be087d188415201db9a805aee64f3facb6554ed04d2a92fce0ca5b4e91b067fe8e43e619df96dec7fc3a5e7a23873df1",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.11-commit.f051675": "57b857af21de285efd573ca87b6529e50e77cc10979dcbae5fb1dd53ddbabcd3336b9e4b4d04df3c952c6bc38873ea78cb6d5344fdbc49267df1c25c71471082",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.11-commit.f051675": "0987f270ced3ff3e675a040b676fbd4a687080b124260e323e2c2aede7b59eb3b7d897064b5828031b91846ee5b483f10de85ed5b0468351780723ba0ecfc887",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.11-commit.f051675": "0fffddc899ea0c2dbec2b8b21f6f6ced4cc483bd111f3c9c2684f57af9fdfed0e4adad95b3b027018b2b0f8801210f2ab4acf0d37d3702beddd8cf204f95d28f",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.11-commit.f051675": "0c2af36aca65e86b967f6d350176420fdd453c7dbb7796611c181aa87f2090edb577132edd1496964f7bae7346fc9ec15968ae39012f4e5fc347a82e867bd8aa",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.11-commit.f051675": "1f843a7d2283ac4f6daff6239108e7fa2680bd3795f06923603f6d693844bc990a85b66fc67005fd03a2eec7c8097c4737b935e9e448853d4a60c208b979a5ca",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.11-commit.f051675": "f2be00d8c8cb67c216ae1f67b491bb1dfc7b5eaab66fc84a550ea45ff7f79080631b5748ca984a88a5806994aa2618933bba0d643cdc6b82f1268fc0025647f0",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.11-commit.f051675": "b8fffeb3ede11a93235713f864e25270be2e3e3ddf77ba9bb4e534743e3f859b6ffff5a33e5c22e9e19745371f4d30f9a324990411a07e7e00e6f94a6ceb6fde",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.11-commit.f051675": "2b7ea4e614a53acd3f9291b33d5e908d5f821354006610aaa53fea1a7f0cf6f8123e9f16424512a6c65e06a0c79ac324e9e067b3cddb10a434fc2470c2374b02",
+  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.11-commit.f051675": "e147c9f648a0d95dcbaf963380968762dd6feabb9403897ba17c123e8b9bb4eb94bad5096d4fdfe8f37454195f8391e01759c1ce86d1f41f73908f0b23f8c0fa",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.11-commit.f051675": "2ae46229ecfd2ed001f4a2e263bf7776896180c117d263526dc478ee30aff5569ee9f82b52fc1085d08f889aab6751c96e4988ac489f6b942ea7424e1fb8f43f",
+  "@rollup/rollup-android-arm-eabi@npm:4.43.0": "8e37e27b359200197cddf9c1aa5bb5f2d0d8e640fe30f0ccc4b77d9c730b2fdda6f3b6f97a0afc45c5113f23637f98c5c89abf982a222cc3f6b00192a2a998fa",
+  "@rollup/rollup-android-arm64@npm:4.43.0": "6e7ee0f496d30cfeca8d930c512f331053d87076b67f06303339ef19120dca5895bc2072ab3da7b99fb93f6c6c275d4d874a66bff08afeac4cea5447cdc709a3",
+  "@rollup/rollup-darwin-arm64@npm:4.43.0": "7b76fb8e7ccc40ff17f9584b0cdacce22e384ce1229860b0971417236884d100362a79a12cdcbd0254dcd0f68d7db6cfe11c60f38e7a672cf62b0b8abe6834e9",
+  "@rollup/rollup-darwin-x64@npm:4.43.0": "9209a1d1f97dad0810dc280485658b78cf597398da4ce2c2ccab04d4bbe0a05966325760d399209b67d746711bf204c4d8896941159ac5569e6a3a6738807e3a",
+  "@rollup/rollup-freebsd-arm64@npm:4.43.0": "d89e2a6234d2cd2f18c168a832f518864c2c66c93f230ada42014b631ea0d04cb790269cbe0bb67e0bfbdcdf8b5b5069de1382be15380f469c02a51570d60729",
+  "@rollup/rollup-freebsd-x64@npm:4.43.0": "0d4c3c6dc027a57e4ef1897acc58996e179f89130858f8849de9c6fbe4a9ffab5b226d0729c1bc8b15528271c0d0093e9c6df9831a01fa5baa870825306484a0",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.43.0": "f7c29e494b75719b3efdf6958c81e95b9c79bd4e3b8fe775088676a35da4e49301175fe4d1b3dc176348817f3ee7645ed34381e4801655c62c8b7de5a079c8e3",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.43.0": "0ff5c0dfe63f3d4a5f3914555b6557f5d9a76af751ee4ae8fd4264ac8e2538108b20fb4049637bfee71f67e69b8cc5a4c38d1c0a029247e657a703594ec5733c",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.43.0": "2138243743cd1c5ff59de2e56f7b40aefb0c8e7b54a028fa6f40407594cf82a8f71d7c25368d54e5470e12fe6565dde2ade26e7a2e303368a4c216f907407feb",
+  "@rollup/rollup-linux-arm64-musl@npm:4.43.0": "7b7ec641ff9b86e144971913ab40e6fdccbf9a45e501c6c5dc6e102ef28e1cad4a05ede0f4c9c1d21da9242033e221b491948e552acb5774cc033f97519da5dc",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.43.0": "eca2d22690858529fee43bacb8e5c3da972d07d68a0418437af18294a6abe181e0d46aac597ce13dd5ff9b22b3a4eec88e958f526082ae116d140a3e04466801",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.43.0": "2b560dc6d6af7350fa7bd504c9e4357e677a56c4c62c27efa0162252482c8fffdbb1c77710a4f37325e8a8afd3ed9272b9998fb82472e72a2cacc5fa11cda633",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.43.0": "7eaf269704ed32475620e5e293bc7db7ca15c0556de3b487cb0e08619610a45a9bec8c1db5f4a3294f229bed95a6c099fea37f2d1a012cef0322a9b42a5bd27f",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.43.0": "fe28cbe57646d2c78966119db6c91c42c0f48a9f1175fd4596697107a6f4a229484f45344fbd8656f6875fcc22fa565603688fd02a02c98007aa30aee34b066d",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.43.0": "60691ae9cc5f68fb845c972e337c8c8230078fe9a204a249670de21c72d1e8ccac1f0d47347eb720e87068b0f1fb86af54edbcf5d20fe25b1d1cd5e76db7a0f1",
+  "@rollup/rollup-linux-x64-gnu@npm:4.43.0": "337a87aed8d5b07f8e5bd8e1b0fe6b7e03edaabc948076dd817d70badb5c5081e9c0faf36411e54fddc633e0a8eb4f1f348208678184794116cecbded2c5b288",
+  "@rollup/rollup-linux-x64-musl@npm:4.43.0": "e85942bd31ecf417f25220f1f376395e5a679f8d0c9e4fa7084d5d61265da00d2f483aef3a97884c94ed572e6d3b98ecc7707efbbf2dbdd4d8b9a5b9c4350a56",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.43.0": "c6a793b1a16fdfe801018f2ff9d92290da6695e8041fc543a36daca859379f03fcb2d1d688891a9cfff0223962da38fd33f661a5c93d46a794c1eb4fa79ff119",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.43.0": "305a82fdea7656d83efce73720c0d36c6da4734e9e05f3696d032272fd61de767991e04fa02b0abaf18c4aeaf17f7a61a2e7552d923d89d6a9abfba4a5e37657",
+  "@rollup/rollup-win32-x64-msvc@npm:4.43.0": "966e5f3d7996f41ea6cee2e0a20276cb314029bceee9b9e7512c47a3d139e1601231490229a66e8f5824b64d72c508e272f9f5f62d6b8b2a61722c17aa0ac3a1"
+}
diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix
new file mode 100644
index 000000000000..61d1950a11ac
--- /dev/null
+++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  fetchFromGitHub,
+  yarn-berry_4,
+  stdenv,
+  nodejs,
+  makeWrapper,
+}:
+let
+  pname = "swagger-typescript-api";
+  version = "13.2.2";
+  yarn-berry = yarn-berry_4;
+in
+stdenv.mkDerivation (finalAttrs: {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "acacode";
+    repo = "swagger-typescript-api";
+    rev = version;
+    hash = "sha256-dpziQNXLwo2W+zZdFujaNufVoGg8M11G79LVWTi9G/M=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    yarn-berry.yarnBerryConfigHook
+    yarn-berry
+    nodejs
+  ];
+
+  missingHashes = ./missing-hashes.json;
+  offlineCache = yarn-berry.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-pD/yx1DyccEWczvDQM+gseravu8eIqumOBuG65htYr8=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib
+    cp -r {dist,templates,node_modules} $out/lib
+
+    makeWrapper ${nodejs}/bin/node $out/bin/${pname} \
+      --add-flags $out/lib/dist/cli.js \
+      --set NODE_ENV production \
+      --set NODE_PATH "$out/lib/node_modules"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    mainProgram = "swagger-typescript-api";
+    description = "Generate TypeScript API client and definitions for fetch or axios from an OpenAPI specification";
+    homepage = "https://github.com/acacode/swagger-typescript-api";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ angelodlfrtr ];
+  };
+})
diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 4d5b68871deb..b3c112af925b 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.85.4";
+  version = "1.85.5";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-K+GIETe/SpBCgJS7KD8Rw8z1zrmnXdYjjTyl36pUzmg=";
+    hash = "sha256-djIGgZ5qehrkQZlxe2+3XzRb5FfewZVcquYiitGfFdo=";
   };
 
-  vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY=";
+  vendorHash = "sha256-9IvnIFOlLdqmntisNomO5K6PU8gw7CSuEb46zG5ox2A=";
 
   excludedPackages = [ "scripts/jsonschema" ];
 
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 5d2c282439ce..be118252e32d 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.0.16";
+  version = "2.0.18";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-+0sVumtXEJQEP3vFQ7QU4zA4PuqCRDH5+fetD8PqtBg=";
+    hash = "sha256-44K76pNJ0SRKAF8QdHYSi5htQpbP6YNNg6vDkzaeqaI=";
   };
 
-  npmDepsHash = "sha256-I9h/5sIOXJWm/+YJbXQ5QUfoMnTNiOz27LSEiVS4FXA=";
+  npmDepsHash = "sha256-ShEqO6nL2YK2wdHGEcKff0fJsd9N9LI0VfhFe6FQ2gw=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index b70798c67d9b..dc609c2f012f 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "telegraf";
-  version = "1.34.4";
+  version = "1.35.0";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-oFhSCBGS8brXBxUiuXTCQiwRWuLvjDPte2Zi6BwelJs=";
+    hash = "sha256-lBD+GzFlm1CRfOQORYCDndNvObzxkkCijsGu2YsagYI=";
   };
 
-  vendorHash = "sha256-C4p+dZkudSIJI4036RR5J8rokEUB1Vi+xTC6Ijf9gUc=";
+  vendorHash = "sha256-RVpw94W8rrJSIsFmZRSo29h6ZN9xzYBqbGs46ZIwzKc=";
   proxyVendor = true;
 
   ldflags = [
diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix
index 6f355bf2e975..2a0bb57ad6e1 100644
--- a/pkgs/by-name/te/texlab/package.nix
+++ b/pkgs/by-name/te/texlab/package.nix
@@ -14,17 +14,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "5.22.1";
+  version = "5.23.0";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     tag = "v${version}";
-    hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU=";
+    hash = "sha256-bKjogyIPrP3USDHsI4m8u44T+WYF1kyDz8eRpZ4j/xU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-omMisd2lY9BPIp/0yJ5Eg3pAIvwIWcEJE0ygTj2yqwo=";
+  cargoHash = "sha256-Dblnlh9l3tQI4IYWVZdpLz0Hyvg4SY6O5R3Naz515QQ=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   # generate the man page
   postInstall = lib.optionalString (!isCross) ''
     # TexLab builds man page separately in CI:
-    # https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114
+    # https://github.com/latex-lsp/texlab/blob/v5.23.0/.github/workflows/publish.yml#L110-L114
     help2man --no-info "$out/bin/texlab" > texlab.1
     installManPage texlab.1
   '';
diff --git a/pkgs/by-name/ti/tile38/package.nix b/pkgs/by-name/ti/tile38/package.nix
index dabf52b762f4..9615e7b6624d 100644
--- a/pkgs/by-name/ti/tile38/package.nix
+++ b/pkgs/by-name/ti/tile38/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tile38";
-  version = "1.34.4";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "tidwall";
     repo = "tile38";
     tag = version;
-    hash = "sha256-TLVFFgT5lxOLhv1RBS09DCcZAozkcHzIBlJSWt1ztB4=";
+    hash = "sha256-n17W/JOtVV6Mjhp81xx25j6GUbR9WCd3JLh9voyMeC0=";
   };
 
-  vendorHash = "sha256-geXYLeJf/u+8RD7Slr2x+J6zABkWSIfhxKLxZVF/icU=";
+  vendorHash = "sha256-/EgUacA9xTUw3e8208NWxhaeZ/KgHLSnxy/fIqC+gZE=";
 
   subPackages = [
     "cmd/tile38-cli"
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index bab53e3d1111..bd43271ff243 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.34.5";
+    version = "0.35.0";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-UCQN1DKscBOhta4Ok5ZeqAUQIqbn8G7aLIeYExCqg1o=";
+      hash = "sha256-IXmycwZFeDbCNFtLh126FvVSuugFoElj1TfU5Bdl5rc=";
     };
   };
 
diff --git a/pkgs/by-name/ti/timetrap/package.nix b/pkgs/by-name/ti/timetrap/package.nix
index 9e172d7e1866..25b5ef5c76bc 100644
--- a/pkgs/by-name/ti/timetrap/package.nix
+++ b/pkgs/by-name/ti/timetrap/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   lib,
+  ruby_3_4,
   bundlerEnv,
   bundlerApp,
   bundlerUpdateScript,
@@ -8,7 +9,7 @@
 }:
 
 let
-  ttBundlerApp = bundlerApp {
+  ttBundlerApp = (bundlerApp.override { ruby = ruby_3_4; }) {
     pname = "timetrap";
     gemdir = ./.;
     exes = [
@@ -19,7 +20,7 @@ let
     passthru.updateScript = bundlerUpdateScript "timetrap";
   };
 
-  ttGem = bundlerEnv {
+  ttGem = (bundlerEnv.override { ruby = ruby_3_4; }) {
     pname = "timetrap";
     gemdir = ./.;
   };
diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix
index eb113828ccc4..44a9edf5f70c 100644
--- a/pkgs/by-name/tu/tuist/package.nix
+++ b/pkgs/by-name/tu/tuist/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tuist";
-  version = "4.38.2";
+  version = "4.53.4";
 
   src = fetchurl {
     url = "https://github.com/tuist/tuist/releases/download/${finalAttrs.version}/tuist.zip";
-    hash = "sha256-FK9F0Y3p04NOoy1Mnlcvimm/LGA5Y+lQ9P679SNNOzA=";
+    hash = "sha256-4YQY94/uWh/H4cCzhdQ3KxIh19D8mmUCCDKMF8ZwA4E=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index 6ab5ac96ddd7..97adcd8bb595 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -5,42 +5,47 @@
   makeWrapper,
   nix-update-script,
   nodejs,
-  pnpm_9,
+  pnpm,
   testers,
 }:
 
 let
-  workspace = "compiler...";
+  workspace = "@typespec/compiler...";
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "typespec";
-  version = "0.64.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typespec";
-    tag = "typespec@${finalAttrs.version}";
-    hash = "sha256-zZTZdnmRTjhnoz/5JHnn4h/YlMpXF/I7o1mDeiRVPUA=";
+    tag = "typespec-stable@${finalAttrs.version}";
+    hash = "sha256-fUrBoDDv0UW5dqudD/bpzaT8SdIc5snI8Q/Fe5jWCvw=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     nodejs
-    pnpm_9.configHook
+    pnpm.configHook
   ];
 
   pnpmWorkspaces = [ workspace ];
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs)
       pname
       version
       src
       pnpmWorkspaces
+      postPatch
       ;
-    hash = "sha256-W8m6ibiy9Okga0qWpZWDYklXAwpHwk85Q6UTaFJhDrU=";
+    hash = "sha256-9RQZ2ycu78W3Ie6MLpo6x7Sa/iYsUdq5bYed56mOPxs=";
   };
 
   postPatch = ''
+    # The `packageManager` attribute matches the version _exactly_, which makes
+    # the build fail if it doesn't match exactly.
+    substituteInPlace package.json \
+      --replace-fail '"packageManager": "pnpm@10.11.0"' '"packageManager": "pnpm"'
     # `fetchFromGitHub` doesn't clone via git and thus installing would otherwise fail.
     substituteInPlace packages/compiler/scripts/generate-manifest.js \
       --replace-fail 'execSync("git rev-parse HEAD").toString().trim()' '"${finalAttrs.src.rev}"'
@@ -54,12 +59,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
+  preInstall = ''
+    # Remove unnecessary files.
+    find -name node_modules -type d -exec rm -rf {} \; || true
+    pnpm config set hoist=false
+    pnpm install --offline --ignore-scripts --frozen-lockfile --filter="@typespec/compiler" --prod --no-optional
+  '';
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin" "$out/lib/typespec/packages/compiler"
+    mkdir -p "$out/bin" "$out/lib/typespec"
     cp -r --parents \
-      node_modules \
+      node_modules/ \
       package.json \
       packages/compiler/cmd \
       packages/compiler/dist \
@@ -83,7 +95,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   passthru.updateScript = nix-update-script {
-    extraArgs = [ ''--version-regex=typespec@(\d+\.\d+\.\d+)'' ];
+    extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ];
   };
 
   meta = {
@@ -97,7 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       All this while keeping your TypeSpec definition as a single source of truth.
     '';
     homepage = "https://typespec.io/";
-    changelog = "https://github.com/microsoft/typespec/releases/tag/typespec@${finalAttrs.version}";
+    changelog = "https://github.com/microsoft/typespec/releases/tag/typespec-stable@${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ paukaifler ];
     mainProgram = "tsp";
diff --git a/pkgs/by-name/ua/uae/package.nix b/pkgs/by-name/ua/uae/package.nix
deleted file mode 100644
index 9ef978a25e7a..000000000000
--- a/pkgs/by-name/ua/uae/package.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  alsa-lib,
-  SDL,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "uae";
-  version = "0.8.29";
-
-  src = fetchurl {
-    url = "https://web.archive.org/web/20130905032631/http://www.amigaemulator.org/files/sources/develop/uae-${version}.tar.bz2";
-    sha256 = "05s3cd1rd5a970s938qf4c2xm3l7f54g5iaqw56v8smk355m4qr4";
-  };
-
-  configureFlags = [
-    "--with-sdl"
-    "--with-sdl-sound"
-    "--with-sdl-gfx"
-    "--with-alsa"
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    alsa-lib
-    SDL
-  ];
-
-  hardeningDisable = [ "format" ];
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: bsdsocket.o:(.bss+0x0): multiple definition of
-  #     `socketbases'; main.o:(.bss+0x2792c0): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-  LDFLAGS = [ "-lm" ];
-
-  meta = {
-    description = "Ultimate/Unix/Unusable Amiga Emulator";
-    license = lib.licenses.gpl2Plus;
-    homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/";
-    maintainers = [ lib.maintainers.sander ];
-    platforms = lib.platforms.linux;
-    mainProgram = "uae";
-  };
-}
diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index 336487955235..f43652f62b4f 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.16.2";
+  version = "0.17.0-dev.1";
   tag = version;
-  hash = "sha256-YX2okLBN+6celACktfLgTO4NJPvEalrS/C885qwAp8A=";
-  cargoHash = "sha256-aoHqcE+0OaxZAxjAZUdSmAuLaI0kiRfbPhaFjNvFce8=";
+  hash = "sha256-Tsj0De4qdV8R4XVP5Oihk7HlgG4EysfQ9aUo0MZO94A=";
+  cargoHash = "sha256-upBPtoivWh07w87jNu5mjS5Yj+slsJtAIMAOjX1MZaM=";
   updateScript = ./update-unstable.sh;
 }
diff --git a/pkgs/by-name/un/undertime/package.nix b/pkgs/by-name/un/undertime/package.nix
index dbc28888671d..43b66209c81a 100644
--- a/pkgs/by-name/un/undertime/package.nix
+++ b/pkgs/by-name/un/undertime/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "undertime";
-  version = "4.0.0";
+  version = "4.3.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "anarcat";
     repo = "undertime";
-    rev = version;
-    hash = "sha256-BshgSnYaeX01KQ1fggB+yXEfg3Trhpcf/k4AmBDPxy8=";
+    tag = version;
+    hash = "sha256-sQI+fpg5PFGCsS9xikMTi4Ad76TayP13UgZag6CRBxE=";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     setuptools-scm
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     dateparser
     ephem
     pytz
diff --git a/pkgs/by-name/un/unhide/package.nix b/pkgs/by-name/un/unhide/package.nix
index e6dd2c8ec8aa..eede250876f5 100644
--- a/pkgs/by-name/un/unhide/package.nix
+++ b/pkgs/by-name/un/unhide/package.nix
@@ -1,15 +1,15 @@
 {
-  cmake,
+  lib,
+  stdenv,
   fetchFromGitHub,
   fetchurl,
+  cmake,
   iproute2,
-  lib,
   lsof,
   nettools,
   pkg-config,
   procps,
   psmisc,
-  stdenv,
 }:
 
 let
@@ -18,15 +18,15 @@ let
     hash = "sha256-bSo3EzpcsFmVvwyPgjCCDOJLbzNpxJ6Eptp2hNK7ZXk=";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unhide";
-  version = "20220611";
+  version = "20240510";
 
   src = fetchFromGitHub {
     owner = "YJesus";
     repo = "Unhide";
-    rev = "v${version}";
-    hash = "sha256-v4otbDhKKRLywH6aP+mbMR0olHbW+jk4TXTBY+iaxdo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CcS/rR/jPgbcF09aM4l6z52kwFhdQI1VZOyDF2/X6Us=";
   };
 
   postPatch = ''
@@ -55,10 +55,10 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Forensic tool to find hidden processes and TCP/UDP ports by rootkits/LKMs";
     homepage = "https://github.com/YJesus/Unhide";
-    changelog = "https://github.com/YJesus/Unhide/blob/${src.rev}/NEWS";
+    changelog = "https://github.com/YJesus/Unhide/blob/${finalAttrs.src.rev}/NEWS";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ tochiaha ];
     mainProgram = "unhide";
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/un/units-llnl/package.nix b/pkgs/by-name/un/units-llnl/package.nix
new file mode 100644
index 000000000000..fcba27fb936c
--- /dev/null
+++ b/pkgs/by-name/un/units-llnl/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+
+  # This is the baseType needed by scipp - the main package that depends on
+  # this package.
+  baseType ? "uint64_t",
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "units-llnl";
+  version = "0.13.1";
+
+  src = fetchFromGitHub {
+    owner = "LLNL";
+    repo = "units";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-thJnBT+wQPF9obzXk/T6H9lvPEAH5REx3YhBXEd7n7c=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeFeature "UNITS_BASE_TYPE" baseType)
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "Run-time C++ library for working with units of measurement and conversions between them and with string representations of units and measurements";
+    homepage = "https://github.com/llnl/units";
+    changelog = "https://github.com/llnl/units/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    mainProgram = "units-llnl";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/un/unixcw/package.nix b/pkgs/by-name/un/unixcw/package.nix
index fc169b90d32f..913bd71693bf 100644
--- a/pkgs/by-name/un/unixcw/package.nix
+++ b/pkgs/by-name/un/unixcw/package.nix
@@ -10,18 +10,16 @@
   autoreconfHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unixcw";
-  version = "3.5.1";
+  version = "3.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/unixcw/unixcw_${version}.orig.tar.gz";
-    hash = "sha256-Xzqs2KJuFubv9DfHrh6bOJlW+xN+6z3iRnDOBd5Hnno=";
+    url = "mirror://sourceforge/unixcw/unixcw-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Cvg4VSFL+QtMDRSSIYhKtEWPOFfDiXLUKNrr87rdbjI=";
   };
 
   patches = [
-    ./remove-use-of-dlopen.patch
-
     # fix pkg-config searching for ncurses
     # yoinked from gentoo (https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/unixcw/files/unixcw-3.6-tinfo.patch), with modifications
     ./unixcw-3.6-tinfo.patch
@@ -69,4 +67,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch b/pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch
deleted file mode 100644
index 0475c008ba22..000000000000
--- a/pkgs/by-name/un/unixcw/remove-use-of-dlopen.patch
+++ /dev/null
@@ -1,677 +0,0 @@
-From e4b91b5a7943a3b54f555ff2e0029b83bd96b131 Mon Sep 17 00:00:00 2001
-From: MarcFontaine <MarcFontaine@users.noreply.github.com>
-Date: Sat, 9 Jun 2018 11:02:11 +0200
-Subject: [PATCH] remove use of dlopen
-
----
- src/libcw/libcw_alsa.c | 215 ++++++++++---------------------------------------
- src/libcw/libcw_pa.c   | 118 ++++-----------------------
- 2 files changed, 56 insertions(+), 277 deletions(-)
-
-diff --git a/src/libcw/libcw_alsa.c b/src/libcw/libcw_alsa.c
-index a669c6e..17c306d 100644
---- a/src/libcw/libcw_alsa.c
-+++ b/src/libcw/libcw_alsa.c
-@@ -35,7 +35,6 @@
- 
- 
- 
--#include <dlfcn.h> /* dlopen() and related symbols */
- #include <alsa/asoundlib.h>
- 
- 
-@@ -65,7 +64,6 @@ static const snd_pcm_format_t CW_ALSA_SAMPLE_FORMAT = SND_PCM_FORMAT_S16; /* "Si
- 
- 
- static int  cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *params);
--static int  cw_alsa_dlsym_internal(void *handle);
- static int  cw_alsa_write_internal(cw_gen_t *gen);
- static int  cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv);
- static int  cw_alsa_open_device_internal(cw_gen_t *gen);
-@@ -80,56 +78,6 @@ static int  cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params);
- 
- 
- 
--static struct {
--	void *handle;
--
--	int (* snd_pcm_open)(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
--	int (* snd_pcm_close)(snd_pcm_t *pcm);
--	int (* snd_pcm_prepare)(snd_pcm_t *pcm);
--	int (* snd_pcm_drop)(snd_pcm_t *pcm);
--	snd_pcm_sframes_t (* snd_pcm_writei)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
--
--	const char *(* snd_strerror)(int errnum);
--
--	int (* snd_pcm_hw_params_malloc)(snd_pcm_hw_params_t **ptr);
--	int (* snd_pcm_hw_params_any)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
--	int (* snd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
--	int (* snd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
--	int (* snd_pcm_hw_params_set_access)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
--	int (* snd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
--	int (* snd_pcm_hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
--	int (* snd_pcm_hw_params_get_periods)(const snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
--	int (* snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir);
--	int (* snd_pcm_hw_params_get_period_size_min)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *frames, int *dir);
--	int (* snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
--} cw_alsa = {
--	.handle = NULL,
--
--	.snd_pcm_open = NULL,
--	.snd_pcm_close = NULL,
--	.snd_pcm_prepare = NULL,
--	.snd_pcm_drop = NULL,
--	.snd_pcm_writei = NULL,
--
--	.snd_strerror = NULL,
--
--	.snd_pcm_hw_params_malloc = NULL,
--	.snd_pcm_hw_params_any = NULL,
--	.snd_pcm_hw_params_set_format = NULL,
--	.snd_pcm_hw_params_set_rate_near = NULL,
--	.snd_pcm_hw_params_set_access = NULL,
--	.snd_pcm_hw_params_set_channels = NULL,
--	.snd_pcm_hw_params = NULL,
--	.snd_pcm_hw_params_get_periods = NULL,
--	.snd_pcm_hw_params_get_period_size = NULL,
--	.snd_pcm_hw_params_get_period_size_min = NULL,
--	.snd_pcm_hw_params_get_buffer_size = NULL
--};
--
--
--
--
--
- 
- /**
-    \brief Check if it is possible to open ALSA output
-@@ -144,34 +92,19 @@ static struct {
- */
- bool cw_is_alsa_possible(const char *device)
- {
--	const char *library_name = "libasound.so.2";
--	if (!cw_dlopen_internal(library_name, &(cw_alsa.handle))) {
--		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't access ALSA library \"%s\"", library_name);
--		return false;
--	}
--
--	int rv = cw_alsa_dlsym_internal(cw_alsa.handle);
--	if (rv < 0) {
--		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: failed to resolve ALSA symbol #%d, can't correctly load ALSA library", rv);
--		dlclose(cw_alsa.handle);
--		return false;
--	}
--
--	const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE;
-+        int rv;
-+        const char *dev = device ? device : CW_DEFAULT_ALSA_DEVICE;
- 	snd_pcm_t *alsa_handle;
--	rv = cw_alsa.snd_pcm_open(&alsa_handle,
-+	rv = snd_pcm_open(&alsa_handle,
- 				  dev,                     /* name */
- 				  SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */
- 				  0);                      /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
- 			      "cw_alsa: can't open ALSA device \"%s\"", dev);
--		dlclose(cw_alsa.handle);
- 		return false;
- 	} else {
--		cw_alsa.snd_pcm_close(alsa_handle);
-+		snd_pcm_close(alsa_handle);
- 		return true;
- 	}
- }
-@@ -204,7 +137,7 @@ int cw_alsa_write_internal(cw_gen_t *gen)
- 	/* Send audio buffer to ALSA.
- 	   Size of correct and current data in the buffer is the same as
- 	   ALSA's period, so there should be no underruns */
--	int rv = cw_alsa.snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples);
-+	int rv = snd_pcm_writei(gen->alsa_data.handle, gen->buffer, gen->buffer_n_samples);
- 	cw_alsa_debug_evaluate_write_internal(gen, rv);
- 	/*
- 	cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
-@@ -231,7 +164,7 @@ int cw_alsa_write_internal(cw_gen_t *gen)
- */
- int cw_alsa_open_device_internal(cw_gen_t *gen)
- {
--	int rv = cw_alsa.snd_pcm_open(&gen->alsa_data.handle,
-+	int rv = snd_pcm_open(&gen->alsa_data.handle,
- 				      gen->audio_device,       /* name */
- 				      SND_PCM_STREAM_PLAYBACK, /* stream (playback/capture) */
- 				      0);                      /* mode, 0 | SND_PCM_NONBLOCK | SND_PCM_ASYNC */
-@@ -251,7 +184,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
- 	/* TODO: move this to cw_alsa_set_hw_params_internal(),
- 	   deallocate hw_params */
- 	snd_pcm_hw_params_t *hw_params = NULL;
--	rv = cw_alsa.snd_pcm_hw_params_malloc(&hw_params);
-+	rv = snd_pcm_hw_params_malloc(&hw_params);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
- 			      "cw_alsa: can't allocate memory for ALSA hw params");
-@@ -265,7 +198,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
- 		return CW_FAILURE;
- 	}
- 
--	rv = cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
-+	rv = snd_pcm_prepare(gen->alsa_data.handle);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
- 			      "cw_alsa: can't prepare ALSA handler");
-@@ -275,7 +208,7 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
- 	/* Get size for data buffer */
- 	snd_pcm_uframes_t frames; /* period size in frames */
- 	int dir = 1;
--	rv = cw_alsa.snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir);
-+	rv = snd_pcm_hw_params_get_period_size_min(hw_params, &frames, &dir);
- 	cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 		      "cw_alsa: rv = %d, ALSA buffer size would be %u frames", rv, (unsigned int) frames);
- 
-@@ -305,14 +238,11 @@ int cw_alsa_open_device_internal(cw_gen_t *gen)
- void cw_alsa_close_device_internal(cw_gen_t *gen)
- {
- 	/* "Stop a PCM dropping pending frames. " */
--	cw_alsa.snd_pcm_drop(gen->alsa_data.handle);
--	cw_alsa.snd_pcm_close(gen->alsa_data.handle);
-+	snd_pcm_drop(gen->alsa_data.handle);
-+	snd_pcm_close(gen->alsa_data.handle);
- 
- 	gen->audio_device_is_open = false;
- 
--	if (cw_alsa.handle) {
--		dlclose(cw_alsa.handle);
--	}
- 
- #if CW_DEV_RAW_SINK
- 	if (gen->dev_raw_sink != -1) {
-@@ -332,11 +262,11 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv)
- 	if (rv == -EPIPE) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
- 			      "cw_alsa: underrun");
--		cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
-+		snd_pcm_prepare(gen->alsa_data.handle);
- 	} else if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
--			      "cw_alsa: writei: %s", cw_alsa.snd_strerror(rv));
--		cw_alsa.snd_pcm_prepare(gen->alsa_data.handle);
-+			      "cw_alsa: writei: %s", snd_strerror(rv));
-+		snd_pcm_prepare(gen->alsa_data.handle);
- 	} else if (rv != gen->buffer_n_samples) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
- 			      "cw_alsa: short write, %d != %d", rv, gen->buffer_n_samples);
-@@ -363,19 +293,19 @@ int cw_alsa_debug_evaluate_write_internal(cw_gen_t *gen, int rv)
- int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params)
- {
- 	/* Get current hw configuration. */
--	int rv = cw_alsa.snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params);
-+	int rv = snd_pcm_hw_params_any(gen->alsa_data.handle, hw_params);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: get current hw params: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: get current hw params: %s", snd_strerror(rv));
- 		return CW_FAILURE;
- 	}
- 
- 
- 	/* Set the sample format */
--	rv = cw_alsa.snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT);
-+	rv = snd_pcm_hw_params_set_format(gen->alsa_data.handle, hw_params, CW_ALSA_SAMPLE_FORMAT);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't set sample format: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't set sample format: %s", snd_strerror(rv));
- 		return CW_FAILURE;
- 	}
- 
-@@ -387,7 +317,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 	bool success = false;
- 	for (int i = 0; cw_supported_sample_rates[i]; i++) {
- 		rate = cw_supported_sample_rates[i];
--		int rv = cw_alsa.snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir);
-+		int rv = snd_pcm_hw_params_set_rate_near(gen->alsa_data.handle, hw_params, &rate, &dir);
- 		if (!rv) {
- 			if (rate != cw_supported_sample_rates[i]) {
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING, "cw_alsa: imprecise sample rate:");
-@@ -402,7 +332,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 
- 	if (!success) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't get sample rate: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't get sample rate: %s", snd_strerror(rv));
- 		return CW_FAILURE;
-         } else {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
-@@ -410,18 +340,18 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 	}
- 
- 	/* Set PCM access type */
--	rv = cw_alsa.snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
-+	rv = snd_pcm_hw_params_set_access(gen->alsa_data.handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't set access type: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't set access type: %s", snd_strerror(rv));
- 		return CW_FAILURE;
- 	}
- 
- 	/* Set number of channels */
--	rv = cw_alsa.snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS);
-+	rv = snd_pcm_hw_params_set_channels(gen->alsa_data.handle, hw_params, CW_AUDIO_CHANNELS);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't set number of channels: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't set number of channels: %s", snd_strerror(rv));
- 		return CW_FAILURE;
- 	}
- 
-@@ -496,7 +426,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 		snd_pcm_uframes_t accepted = 0; /* buffer size in frames  */
- 		dir = 0;
- 		for (snd_pcm_uframes_t val = 0; val < 10000; val++) {
--			rv = cw_alsa.snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val);
-+			rv = snd_pcm_hw_params_test_buffer_size(gen->alsa_data.handle, hw_params, val);
- 			if (rv == 0) {
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 					      "cw_alsa: accepted buffer size: %u", (unsigned int) accepted);
-@@ -507,10 +437,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 		}
- 
- 		if (accepted > 0) {
--			rv = cw_alsa.snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted);
-+			rv = snd_pcm_hw_params_set_buffer_size(gen->alsa_data.handle, hw_params, accepted);
- 			if (rv < 0) {
- 				cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--					      "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, cw_alsa.snd_strerror(rv));
-+					      "cw_alsa: can't set accepted buffer size %u: %s", (unsigned int) accepted, snd_strerror(rv));
- 			}
- 		} else {
- 			cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
-@@ -526,7 +456,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 		/* this limit should be enough, "accepted" on my machine is 8 */
- 		const unsigned int n_periods_max = 30;
- 		for (unsigned int val = 1; val < n_periods_max; val++) {
--			rv = cw_alsa.snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir);
-+			rv = snd_pcm_hw_params_test_periods(gen->alsa_data.handle, hw_params, val, dir);
- 			if (rv == 0) {
- 				accepted = val;
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
-@@ -534,10 +464,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 			}
- 		}
- 		if (accepted > 0) {
--			rv = cw_alsa.snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir);
-+			rv = snd_pcm_hw_params_set_periods(gen->alsa_data.handle, hw_params, accepted, dir);
- 			if (rv < 0) {
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--					      "cw_alsa: can't set accepted number of periods %d: %s", accepted, cw_alsa.snd_strerror(rv));
-+					      "cw_alsa: can't set accepted number of periods %d: %s", accepted, snd_strerror(rv));
- 			}
- 		} else {
- 			cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
-@@ -549,7 +479,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 		/* Test period size */
- 		dir = 0;
- 		for (snd_pcm_uframes_t val = 0; val < 100000; val++) {
--			rv = cw_alsa.snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir);
-+			rv = snd_pcm_hw_params_test_period_size(gen->alsa_data.handle, hw_params, val, dir);
- 			if (rv == 0) {
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 					      "cw_alsa: accepted period size: %lu", val);
-@@ -562,7 +492,7 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- 		/* Test buffer time */
- 		dir = 0;
- 		for (unsigned int val = 0; val < 100000; val++) {
--			rv = cw_alsa.snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir);
-+			rv = snd_pcm_hw_params_test_buffer_time(gen->alsa_data.handle, hw_params, val, dir);
- 			if (rv == 0) {
- 				cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 					      "cw_alsa: accepted buffer time: %d", val);
-@@ -573,10 +503,10 @@ int cw_alsa_set_hw_params_internal(cw_gen_t *gen, snd_pcm_hw_params_t *hw_params
- #endif /* #if CW_ALSA_HW_BUFFER_CONFIG */
- 
- 	/* Save hw parameters to device */
--	rv = cw_alsa.snd_pcm_hw_params(gen->alsa_data.handle, hw_params);
-+	rv = snd_pcm_hw_params(gen->alsa_data.handle, hw_params);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't save hw parameters: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't save hw parameters: %s", snd_strerror(rv));
- 		return CW_FAILURE;
- 	} else {
- 		return CW_SUCCESS;
-@@ -600,30 +530,30 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params)
- 	unsigned int val = 0;
- 	int dir = 0;
- 
--	int rv = cw_alsa.snd_pcm_hw_params_get_periods(hw_params, &val, &dir);
-+	int rv = snd_pcm_hw_params_get_periods(hw_params, &val, &dir);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't get 'periods': %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't get 'periods': %s", snd_strerror(rv));
- 	} else {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 			      "cw_alsa: 'periods' = %u", val);
- 	}
- 
- 	snd_pcm_uframes_t period_size = 0;
--	rv = cw_alsa.snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir);
-+	rv = snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't get 'period size': %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't get 'period size': %s", snd_strerror(rv));
- 	} else {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 			      "cw_alsa: 'period size' = %u", (unsigned int) period_size);
- 	}
- 
- 	snd_pcm_uframes_t buffer_size;
--	rv = cw_alsa.snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
-+	rv = snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "cw_alsa: can't get buffer size: %s", cw_alsa.snd_strerror(rv));
-+			      "cw_alsa: can't get buffer size: %s", snd_strerror(rv));
- 	} else {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO,
- 			      "cw_alsa: 'buffer size' = %u", (unsigned int) buffer_size);
-@@ -642,70 +572,9 @@ int cw_alsa_print_params_internal(snd_pcm_hw_params_t *hw_params)
- 
- 
- 
--/**
--   \brief Resolve/get symbols from ALSA library
--
--   Function resolves/gets addresses of few ALSA functions used by
--   libcw and stores them in cw_alsa global variable.
--
--   On failure the function returns negative value, different for every
--   symbol that the funciton failed to resolve. Function stops and returns
--   on first failure.
--
--   \param handle - handle to open ALSA library
--
--   \return 0 on success
--   \return negative value on failure
--*/
--static int cw_alsa_dlsym_internal(void *handle)
--{
--	*(void **) &(cw_alsa.snd_pcm_open)    = dlsym(handle, "snd_pcm_open");
--	if (!cw_alsa.snd_pcm_open)    return -1;
--	*(void **) &(cw_alsa.snd_pcm_close)   = dlsym(handle, "snd_pcm_close");
--	if (!cw_alsa.snd_pcm_close)   return -2;
--	*(void **) &(cw_alsa.snd_pcm_prepare) = dlsym(handle, "snd_pcm_prepare");
--	if (!cw_alsa.snd_pcm_prepare) return -3;
--	*(void **) &(cw_alsa.snd_pcm_drop)    = dlsym(handle, "snd_pcm_drop");
--	if (!cw_alsa.snd_pcm_drop)    return -4;
--	*(void **) &(cw_alsa.snd_pcm_writei)  = dlsym(handle, "snd_pcm_writei");
--	if (!cw_alsa.snd_pcm_writei)  return -5;
--
--	*(void **) &(cw_alsa.snd_strerror) = dlsym(handle, "snd_strerror");
--	if (!cw_alsa.snd_strerror) return -10;
--
--	*(void **) &(cw_alsa.snd_pcm_hw_params_malloc)               = dlsym(handle, "snd_pcm_hw_params_malloc");
--	if (!cw_alsa.snd_pcm_hw_params_malloc)              return -20;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_any)                  = dlsym(handle, "snd_pcm_hw_params_any");
--	if (!cw_alsa.snd_pcm_hw_params_any)                 return -21;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_set_format)           = dlsym(handle, "snd_pcm_hw_params_set_format");
--	if (!cw_alsa.snd_pcm_hw_params_set_format)          return -22;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_set_rate_near)        = dlsym(handle, "snd_pcm_hw_params_set_rate_near");
--	if (!cw_alsa.snd_pcm_hw_params_set_rate_near)       return -23;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_set_access)           = dlsym(handle, "snd_pcm_hw_params_set_access");
--	if (!cw_alsa.snd_pcm_hw_params_set_access)          return -24;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_set_channels)         = dlsym(handle, "snd_pcm_hw_params_set_channels");
--	if (!cw_alsa.snd_pcm_hw_params_set_channels)        return -25;
--	*(void **) &(cw_alsa.snd_pcm_hw_params)                      = dlsym(handle, "snd_pcm_hw_params");
--	if (!cw_alsa.snd_pcm_hw_params)                     return -26;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_get_periods)          = dlsym(handle, "snd_pcm_hw_params_get_periods");
--	if (!cw_alsa.snd_pcm_hw_params_get_periods)         return -27;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size)      = dlsym(handle, "snd_pcm_hw_params_get_period_size");
--	if (!cw_alsa.snd_pcm_hw_params_get_period_size)     return -28;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_get_period_size_min)  = dlsym(handle, "snd_pcm_hw_params_get_period_size_min");
--	if (!cw_alsa.snd_pcm_hw_params_get_period_size_min) return -29;
--	*(void **) &(cw_alsa.snd_pcm_hw_params_get_buffer_size)      = dlsym(handle, "snd_pcm_hw_params_get_buffer_size");
--	if (!cw_alsa.snd_pcm_hw_params_get_buffer_size)     return -30;
--
--	return 0;
--}
--
--
--
--
--
- void cw_alsa_drop(cw_gen_t *gen)
- {
--	cw_alsa.snd_pcm_drop(gen->alsa_data.handle);
-+	snd_pcm_drop(gen->alsa_data.handle);
- 
- 	return;
- }
-@@ -721,7 +590,7 @@ void cw_alsa_drop(cw_gen_t *gen)
- 
- 
- #include <stdbool.h>
--#include "libcw_alsa.h"
-+#include "libh"
- 
- 
- 
-diff --git a/src/libcw/libcw_pa.c b/src/libcw/libcw_pa.c
-index 8269e9d..e190200 100644
---- a/src/libcw/libcw_pa.c
-+++ b/src/libcw/libcw_pa.c
-@@ -39,7 +39,6 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <dlfcn.h> /* dlopen() and related symbols */
- #include <string.h>
- #include <assert.h>
- #include <sys/types.h>
-@@ -63,39 +62,12 @@ extern cw_debug_t cw_debug_object_dev;
- 
- 
- static pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, const char *device, const char *stream_name, int *error);
--static int        cw_pa_dlsym_internal(void *handle);
- static int        cw_pa_open_device_internal(cw_gen_t *gen);
- static void       cw_pa_close_device_internal(cw_gen_t *gen);
- static int        cw_pa_write_internal(cw_gen_t *gen);
- 
- 
- 
--static struct {
--	void *handle;
--
--	pa_simple *(* pa_simple_new)(const char *server, const char *name, pa_stream_direction_t dir, const char *dev, const char *stream_name, const pa_sample_spec *ss, const pa_channel_map *map, const pa_buffer_attr *attr, int *error);
--	void       (* pa_simple_free)(pa_simple *s);
--	int        (* pa_simple_write)(pa_simple *s, const void *data, size_t bytes, int *error);
--	pa_usec_t  (* pa_simple_get_latency)(pa_simple *s, int *error);
--	int        (* pa_simple_drain)(pa_simple *s, int *error);
--
--	size_t     (* pa_usec_to_bytes)(pa_usec_t t, const pa_sample_spec *spec);
--	char      *(* pa_strerror)(int error);
--} cw_pa = {
--	.handle = NULL,
--
--	.pa_simple_new = NULL,
--	.pa_simple_free = NULL,
--	.pa_simple_write = NULL,
--	.pa_simple_get_latency = NULL,
--	.pa_simple_drain = NULL,
--
--	.pa_usec_to_bytes = NULL,
--	.pa_strerror = NULL
--};
--
--
--
- 
- static const pa_sample_format_t CW_PA_SAMPLE_FORMAT = PA_SAMPLE_S16LE; /* Signed 16 bit, Little Endian */
- static const int CW_PA_BUFFER_N_SAMPLES = 1024;
-@@ -117,21 +89,6 @@ static const int CW_PA_BUFFER_N_SAMPLES = 1024;
- */
- bool cw_is_pa_possible(const char *device)
- {
--	const char *library_name = "libpulse-simple.so";
--	if (!cw_dlopen_internal(library_name, &(cw_pa.handle))) {
--		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: can't access PulseAudio library \"%s\"", library_name);
--		return false;
--	}
--
--	int rv = cw_pa_dlsym_internal(cw_pa.handle);
--	if (rv < 0) {
--		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: failed to resolve PulseAudio symbol #%d, can't correctly load PulseAudio library", rv);
--		dlclose(cw_pa.handle);
--		return false;
--	}
--
- 	const char *dev = (char *) NULL;
- 	if (device && strcmp(device, CW_DEFAULT_PA_DEVICE)) {
- 		dev = device;
-@@ -145,13 +102,10 @@ bool cw_is_pa_possible(const char *device)
- 
- 	if (!s) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error));
--		if (cw_pa.handle) {
--			dlclose(cw_pa.handle);
--		}
-+			      "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error));
- 		return false;
- 	} else {
--		cw_pa.pa_simple_free(s);
-+		pa_simple_free(s);
- 		s = NULL;
- 		return true;
- 	}
-@@ -186,10 +140,10 @@ int cw_pa_write_internal(cw_gen_t *gen)
- 
- 	int error = 0;
- 	size_t n_bytes = sizeof (gen->buffer[0]) * gen->buffer_n_samples;
--	int rv = cw_pa.pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error);
-+	int rv = pa_simple_write(gen->pa_data.s, gen->buffer, n_bytes, &error);
- 	if (rv < 0) {
- 		cw_debug_msg ((&cw_debug_object), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: pa_simple_write() failed: %s", cw_pa.pa_strerror(error));
-+			      "libcw_pa: pa_simple_write() failed: %s", pa_strerror(error));
- 	} else {
- 		//cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_INFO, "libcw_pa: written %d samples with PulseAudio", gen->buffer_n_samples);
- 	}
-@@ -237,13 +191,13 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con
- 	}
- 
- 	// http://www.mail-archive.com/pulseaudio-tickets@mail.0pointer.de/msg03295.html
--	ba->tlength = cw_pa.pa_usec_to_bytes(50*1000, ss);
--	ba->minreq = cw_pa.pa_usec_to_bytes(0, ss);
--	ba->maxlength = cw_pa.pa_usec_to_bytes(50*1000, ss);
-+	ba->tlength = pa_usec_to_bytes(50*1000, ss);
-+	ba->minreq = pa_usec_to_bytes(0, ss);
-+	ba->maxlength = pa_usec_to_bytes(50*1000, ss);
- 	/* ba->prebuf = ; */ /* ? */
- 	/* ba->fragsize = sizeof(uint32_t) -1; */ /* not relevant to playback */
- 
--	pa_simple *s = cw_pa.pa_simple_new(NULL,                  /* server name (NULL for default) */
-+	pa_simple *s = pa_simple_new(NULL,                  /* server name (NULL for default) */
- 					   "libcw",               /* descriptive name of client (application name etc.) */
- 					   PA_STREAM_PLAYBACK,    /* stream direction */
- 					   dev,                   /* device/sink name (NULL for default) */
-@@ -258,47 +212,6 @@ pa_simple *cw_pa_simple_new_internal(pa_sample_spec *ss, pa_buffer_attr *ba, con
- 
- 
- 
--
--
--/**
--   \brief Resolve/get symbols from PulseAudio library
--
--   Function resolves/gets addresses of few PulseAudio functions used by
--   libcw and stores them in cw_pa global variable.
--
--   On failure the function returns negative value, different for every
--   symbol that the funciton failed to resolve. Function stops and returns
--   on first failure.
--
--   \param handle - handle to open PulseAudio library
--
--   \return 0 on success
--   \return negative value on failure
--*/
--int cw_pa_dlsym_internal(void *handle)
--{
--	*(void **) &(cw_pa.pa_simple_new)         = dlsym(handle, "pa_simple_new");
--	if (!cw_pa.pa_simple_new)         return -1;
--	*(void **) &(cw_pa.pa_simple_free)        = dlsym(handle, "pa_simple_free");
--	if (!cw_pa.pa_simple_free)        return -2;
--	*(void **) &(cw_pa.pa_simple_write)       = dlsym(handle, "pa_simple_write");
--	if (!cw_pa.pa_simple_write)       return -3;
--	*(void **) &(cw_pa.pa_strerror)           = dlsym(handle, "pa_strerror");
--	if (!cw_pa.pa_strerror)           return -4;
--	*(void **) &(cw_pa.pa_simple_get_latency) = dlsym(handle, "pa_simple_get_latency");
--	if (!cw_pa.pa_simple_get_latency) return -5;
--	*(void **) &(cw_pa.pa_simple_drain)       = dlsym(handle, "pa_simple_drain");
--	if (!cw_pa.pa_simple_drain)       return -6;
--	*(void **) &(cw_pa.pa_usec_to_bytes)      = dlsym(handle, "pa_usec_to_bytes");
--	if (!cw_pa.pa_usec_to_bytes)       return -7;
--
--	return 0;
--}
--
--
--
--
--
- /**
-    \brief Open PulseAudio output, associate it with given generator
- 
-@@ -325,16 +238,16 @@ int cw_pa_open_device_internal(cw_gen_t *gen)
- 
-  	if (!gen->pa_data.s) {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: can't connect to PulseAudio server: %s", cw_pa.pa_strerror(error));
-+			      "libcw_pa: can't connect to PulseAudio server: %s", pa_strerror(error));
- 		return false;
- 	}
- 
- 	gen->buffer_n_samples = CW_PA_BUFFER_N_SAMPLES;
- 	gen->sample_rate = gen->pa_data.ss.rate;
- 
--	if ((gen->pa_data.latency_usecs = cw_pa.pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) {
-+	if ((gen->pa_data.latency_usecs = pa_simple_get_latency(gen->pa_data.s, &error)) == (pa_usec_t) -1) {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--			      "libcw_pa: pa_simple_get_latency() failed: %s", cw_pa.pa_strerror(error));
-+			      "libcw_pa: pa_simple_get_latency() failed: %s", pa_strerror(error));
- 	}
- 
- #if CW_DEV_RAW_SINK
-@@ -357,20 +270,17 @@ void cw_pa_close_device_internal(cw_gen_t *gen)
- 	if (gen->pa_data.s) {
- 		/* Make sure that every single sample was played */
- 		int error;
--		if (cw_pa.pa_simple_drain(gen->pa_data.s, &error) < 0) {
-+		if (pa_simple_drain(gen->pa_data.s, &error) < 0) {
- 			cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_ERROR,
--				      "libcw_pa: pa_simple_drain() failed: %s", cw_pa.pa_strerror(error));
-+				      "libcw_pa: pa_simple_drain() failed: %s", pa_strerror(error));
- 		}
--		cw_pa.pa_simple_free(gen->pa_data.s);
-+		pa_simple_free(gen->pa_data.s);
- 		gen->pa_data.s = NULL;
- 	} else {
- 		cw_debug_msg ((&cw_debug_object_dev), CW_DEBUG_SOUND_SYSTEM, CW_DEBUG_WARNING,
- 			      "libcw_pa: called the function for NULL PA sink");
- 	}
- 
--	if (cw_pa.handle) {
--		dlclose(cw_pa.handle);
--	}
- 
- #if CW_DEV_RAW_SINK
- 	if (gen->dev_raw_sink != -1) {
--- 
-2.16.2
-
diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index 7985098dc9c8..ad86a7220300 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -4,23 +4,24 @@
   fetchFromGitHub,
   nix-update-script,
   versionCheckHook,
+  dbus,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "upcloud-cli";
-  version = "3.15.0";
+  version = "3.20.1";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
-    tag = "v${version}";
-    hash = "sha256-bluq5rrfsd8xmKeqtNDqsZnhEAVZ4VqY/eYvOzXFKv4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X+nv9MA20z2fJ2N+gyUkwGCHjX2hYMHSv8jfwKbegNE=";
   };
 
-  vendorHash = "sha256-J0hLDQzyLYa8Nao0pR2eRkuJ5gP2VM9z+2n694YDYgI=";
+  vendorHash = "sha256-kyIsTNLC1hKsSbZel97eUtBLyH/3iTEvSMsV+6u347c=";
 
   ldflags = [
-    "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${version}"
+    "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}"
   ];
 
   subPackages = [
@@ -28,23 +29,29 @@ buildGoModule rec {
     "internal/*"
   ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeCheckInputs = [ dbus ];
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestConfig_LoadKeyring" # Not equal: expected: "unittest_password" actual  : ""
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/upctl";
   versionCheckProgramArg = "version";
   doInstallCheck = true;
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
-    changelog = "https://github.com/UpCloudLtd/upcloud-cli/blob/refs/tags/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/UpCloudLtd/upcloud-cli/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md";
     description = "Command-line tool for managing UpCloud services";
     homepage = "https://github.com/UpCloudLtd/upcloud-cli";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ lu1a ];
     mainProgram = "upctl";
   };
-}
+})
diff --git a/pkgs/by-name/us/usbkvm/package.nix b/pkgs/by-name/us/usbkvm/package.nix
index a70b5773a975..76ec6030d3d7 100644
--- a/pkgs/by-name/us/usbkvm/package.nix
+++ b/pkgs/by-name/us/usbkvm/package.nix
@@ -1,51 +1,72 @@
 {
+  lib,
+  stdenv,
   buildGoModule,
   fetchzip,
   gst_all_1,
   gtkmm3,
   hidapi,
-  lib,
   makeWrapper,
   meson,
   ninja,
   pkg-config,
   python3,
-  stdenv,
   udev,
   udevCheckHook,
   wrapGAppsHook3,
 }:
 
 let
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchzip {
     url = "https://github.com/carrotIndustries/usbkvm/releases/download/v${version}/usbkvm-v${version}.tar.gz";
-    sha256 = "sha256-ng6YpaN7sKEBPJcJAm0kcYtT++orweWRx6uOZFnOGG8=";
+    hash = "sha256-urexPODXU69QfSRHtJVpoDx/6mbPcv6EQ3mR0VRHNiY=";
   };
 
   ms-tools-lib = buildGoModule {
     pname = "usbkvm-ms-tools-lib";
-    inherit version;
+    inherit version src;
 
-    inherit src;
     sourceRoot = "${src.name}/ms-tools";
+
     vendorHash = null; # dependencies are vendored in the release tarball
 
-    buildInputs = [
-      hidapi
-    ];
+    buildInputs = [ hidapi ];
 
     buildPhase = ''
+      runHook preBuild
+
       mkdir -p $out/
       go build -C lib/ -o $out/ -buildmode=c-archive mslib.go
+
+      runHook postBuild
     '';
+
+    meta = {
+      homepage = "https://github.com/carrotIndustries/ms-tools";
+      description = "Program, library and reference designs to develop for MacroSilicon MS2106/MS2109/MS2130 chips";
+      license = lib.licenses.mit;
+    };
   };
 in
 stdenv.mkDerivation {
   pname = "usbkvm";
   inherit version src;
 
+  # The package includes instructions to build the "mslib.{a,h}" files using a
+  # Go compiler, but that doesn't work in the Nix sandbox. We patch out this
+  # build step to instead copy those files from the Nix store:
+  patches = [
+    ./precompiled-mslib.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace-fail "@MSLIB_A_PRECOMPILED@" "${ms-tools-lib}/mslib.a" \
+      --replace-fail "@MSLIB_H_PRECOMPILED@" "${ms-tools-lib}/mslib.h"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     python3
@@ -63,18 +84,6 @@ stdenv.mkDerivation {
     hidapi
   ];
 
-  # The package includes instructions to build the "mslib.{a,h}" files using a
-  # Go compiler, but that doesn't work in the Nix sandbox. We patch out this
-  # build step to instead copy those files from the Nix store:
-  patches = [
-    ./precompiled-mslib.patch
-  ];
-  postPatch = ''
-    substituteInPlace meson.build \
-      --replace-fail "@MSLIB_A_PRECOMPILED@" "${ms-tools-lib}/mslib.a" \
-      --replace-fail "@MSLIB_H_PRECOMPILED@" "${ms-tools-lib}/mslib.h"
-  '';
-
   # Install udev rules in this package's out path:
   mesonFlags = [
     "-Dudevrulesdir=lib/udev/rules.d"
@@ -98,7 +107,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/carrotIndustries/usbkvm";
     description = "Open-source USB KVM (Keyboard, Video and Mouse) adapter";
     changelog = "https://github.com/carrotIndustries/usbkvm/releases/tag/v${version}";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ lschuermann ];
     mainProgram = "usbkvm";
   };
diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 6c1aeda8e297..29649d754025 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -80,13 +80,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsgi";
-  version = "2.0.29";
+  version = "2.0.30";
 
   src = fetchFromGitHub {
     owner = "unbit";
     repo = "uwsgi";
     tag = finalAttrs.version;
-    hash = "sha256-WlbvvAu+A0anPItnG8RnWrXm450/xbOloPzUd2L9TuU=";
+    hash = "sha256-I03AshxZyxrRmtYUH1Q+B6ISykjYRMGG+ZQSHRS7vDs=";
   };
 
   patches = [
diff --git a/pkgs/by-name/vo/vobcopy/package.nix b/pkgs/by-name/vo/vobcopy/package.nix
index 3ad1ccb30de2..fbbd641f0910 100644
--- a/pkgs/by-name/vo/vobcopy/package.nix
+++ b/pkgs/by-name/vo/vobcopy/package.nix
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
     description = "Copies DVD .vob files to harddisk, decrypting them on the way";
     homepage = "http://vobcopy.org/projects/c/c.shtml";
     license = lib.licenses.gpl2Plus;
-
-    maintainers = [ lib.maintainers.bluescreen303 ];
     platforms = lib.platforms.all;
     mainProgram = "vobcopy";
   };
diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix
index 434de05c90ce..fdc6315d5364 100644
--- a/pkgs/by-name/vp/vpv/package.nix
+++ b/pkgs/by-name/vp/vpv/package.nix
@@ -17,20 +17,20 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vpv";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "kidanger";
     repo = "vpv";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-mlBceYMfsAE7MI6J7xnkJHBJ8RInePooXH5YW9I47YM=";
+    sha256 = "sha256-eyfRMoocKEt0VezDRm5Tq7CjpEyfrcEb6WcUSO5M1Og=";
   };
 
   cargoRoot = "src/fuzzy-finder";
   cargoDeps = rustPlatform.fetchCargoVendor {
     src = finalAttrs.src;
     sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder";
-    hash = "sha256-5QjKvndExImVn+w6OZNSD5n7K3C+tmN2jJOcDCVEW8I=";
+    hash = "sha256-4XxhKzrfTulAnLvlzRCrxSxuR+Nl/ANqcUem0YqCQ0Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 0c963455797f..259f5d06c125 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -27,7 +27,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.11.4";
+  version = "5.12.1";
 
   pyproject = true;
 
@@ -40,7 +40,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-0/PYl8A95r0xulaSawnSyrSqB7SiEBgd9TVP7OIla00=";
+    hash = "sha256-8tqPxvSvVG1j/TGMozihtBYsn7oly41lP4iK3BwTmVk=";
   };
 
   patches = [
@@ -135,6 +135,7 @@ python.pkgs.buildPythonApplication rec {
       siphashc
       social-auth-app-django
       social-auth-core
+      standardwebhooks
       tesserocr
       translate-toolkit
       translation-finder
@@ -149,7 +150,7 @@ python.pkgs.buildPythonApplication rec {
     ++ drf-spectacular.optional-dependencies.sidecar
     ++ drf-standardized-errors.optional-dependencies.openapi;
 
-  pythonRelaxDeps = [ "django-otp-webauthn" ];
+  pythonRelaxDeps = [ "certifi" ];
 
   optional-dependencies = {
     postgres = with python.pkgs; [ psycopg ];
diff --git a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
index 0fdb72fd553e..050a2c88ac2a 100644
--- a/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
+++ b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
@@ -94,13 +94,13 @@ lib.checkListOfEnum "${pname}: window control buttons variants" [ "normal" "alt"
   stdenv.mkDerivation
   rec {
     pname = "whitesur-gtk-theme";
-    version = "2025-04-03";
+    version = "2025-06-14";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
       rev = version;
-      hash = "sha256-XSghDBpxAjdQMB9tyV2NIM6j/AzmzsnybGGDYi7u3BQ=";
+      hash = "sha256-+K2HAnpcCqfSw3WmiklMPnJTDuCSBiWe3aGNq2mnFLA=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix
index be16eedd941b..6870acb17abe 100644
--- a/pkgs/by-name/xc/xcp/package.nix
+++ b/pkgs/by-name/xc/xcp/package.nix
@@ -2,30 +2,45 @@
   rustPlatform,
   fetchFromGitHub,
   lib,
+  acl,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xcp";
   version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "tarka";
     repo = "xcp";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TI9lveFJsb/OgGQRiPW5iuatB8dsc7yxBs1rb148nEY=";
   };
 
-  # no such file or directory errors
-  doCheck = false;
-
   useFetchCargoVendor = true;
   cargoHash = "sha256-9cNu0cgoo0/41daJwy/uWIXa2wFhYkcPhJfA/69DVx0=";
 
-  meta = with lib; {
+  checkInputs = [ acl ];
+
+  # disable tests depending on special filesystem features
+  checkNoDefaultFeatures = true;
+  checkFeatures = [
+    "test_no_reflink"
+    "test_no_sparse"
+    "test_no_extents"
+    "test_no_acl"
+    "test_no_xattr"
+    "test_no_perms"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Extended cp(1)";
     homepage = "https://github.com/tarka/xcp";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ lom ];
+    changelog = "https://github.com/tarka/xcp/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ lom ];
     mainProgram = "xcp";
   };
-}
+})
diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index d76e2a4eef9a..92f4addf710f 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_18.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-06-07";
+  version = "0-unstable-2025-06-14";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "422517c673bba086c2b857946ae5a37ee35b8e50";
-    hash = "sha256-88GHKXURfN8vaVNN7wKn562b6FvsIm/sTcUgtuhvVxM=";
+    rev = "f65f044ee51360de6dd26f5ea0a247e92d8f2275";
+    hash = "sha256-cxwawoCLE0E/HaELfI3FG4yhk4GRtjB9pCs9gkeM+uc=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix
index 9e9476ca8f25..d2bb4afed02a 100644
--- a/pkgs/by-name/xe/xeus/package.nix
+++ b/pkgs/by-name/xe/xeus/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xeus";
-  version = "5.2.2";
+  version = "5.2.3";
 
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
     repo = "xeus";
     tag = finalAttrs.version;
-    hash = "sha256-nR247SGnc3TSj6PCrJmY6ccACvYKeSYFMgoawyYLBNs=";
+    hash = "sha256-7hT2Ellgut25R3R28nRKd6/kKmfQf9NCoJ2BV9ZGt8I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix
index d696aa854a81..612f859a3b94 100644
--- a/pkgs/by-name/xn/xnviewmp/package.nix
+++ b/pkgs/by-name/xn/xnviewmp/package.nix
@@ -23,11 +23,11 @@ let
 in
 appimageTools.wrapType2 rec {
   pname = "xnviewmp";
-  version = "1.8.8";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
-    hash = "sha256-zPlb2r+oKNq1iv8dAWE/wbXtKAf3A+XOsSOkciHM6OA=";
+    hash = "sha256-lj6yLxg6VsNq4/3nZG8QuYYL+N+XRlpaN1Lmi307b8Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix
index b48f43dbb2b7..5f00ddaab799 100644
--- a/pkgs/by-name/xr/xrdp/package.nix
+++ b/pkgs/by-name/xr/xrdp/package.nix
@@ -151,8 +151,8 @@ let
 
       cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf
 
-      substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse
-      substituteInPlace $out/etc/xrdp/sesman.ini --replace '#SessionSockdirGroup=root' 'SessionSockdirGroup=xrdp'
+      substituteInPlace $out/etc/xrdp/sesman.ini --replace-fail /etc/xrdp/pulse $out/etc/xrdp/pulse
+      substituteInPlace $out/etc/xrdp/sesman.ini --replace-fail '#SessionSockdirGroup=xrdp' 'SessionSockdirGroup=xrdp'
 
       # remove all session types except Xorg (they are not supported by this setup)
       perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 4b2a80b9da4b..5886d634a592 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.149.0",
+  "version": "0.150.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.149.0/darwin/arm64/yc",
-      "hash": "sha256-9mxc0E0pZlX/kM6Lm9CZcVyR3ih8oNZwicaEYrGVLWY="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.150.0/darwin/arm64/yc",
+      "hash": "sha256-jIK8gCqzDZTp8pM7FSEmeNmdZUIEtD2KwUegkHm8VoY="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.149.0/linux/arm64/yc",
-      "hash": "sha256-oDcBQq3bqRfAKRltpMoxI/tXHOzdmcGOY8Du/VkvVYs="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.150.0/linux/arm64/yc",
+      "hash": "sha256-B639QeVd3d+lLnLNxmToAFFxUa+/9zBUhR749wVuZi0="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.149.0/linux/386/yc",
-      "hash": "sha256-09MR0gx3UBox4Ue1649WpdOxY+hTnchHD1v3PeFdMBs="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.150.0/linux/386/yc",
+      "hash": "sha256-4Rf9el3Qs9c9AKIWDH6lojIxBJthGsjK+qYYqRjcPvI="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.149.0/darwin/amd64/yc",
-      "hash": "sha256-7AhcJKYeVxpJNEl8dEvjVcFR/6aJtqqKRCDv8inyKM8="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.150.0/darwin/amd64/yc",
+      "hash": "sha256-3V9s5kl/rZn2nN2/a3p3WYCdUeF/LA9ATCVNxYADg+U="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.149.0/linux/amd64/yc",
-      "hash": "sha256-vsxxGgqpewpQhUt3eMs6zOWKXgO0nTDOBB0ODfGDWNM="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.150.0/linux/amd64/yc",
+      "hash": "sha256-vKENaNar/rHGqAoOPuo7b/tU29STk2ak6FqUxFqeOto="
     }
   }
 }
diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/1001-treewide-Fix-imports-in-tests-after-QML-files-were-moved.patch b/pkgs/desktops/lomiri/applications/lomiri-camera-app/1001-treewide-Fix-imports-in-tests-after-QML-files-were-moved.patch
new file mode 100644
index 000000000000..8e6dea483727
--- /dev/null
+++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/1001-treewide-Fix-imports-in-tests-after-QML-files-were-moved.patch
@@ -0,0 +1,86 @@
+From 75a0baa32f434546c5d6cfaf8ae19d561aa8dddd Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Mon, 9 Jun 2025 20:00:40 +0200
+Subject: [PATCH] treewide: Fix imports in tests after QML files were moved out
+ of top-level dir
+
+---
+ CMakeLists.txt                               | 2 ++
+ tests/unittests/tst_BottomEdgeIndicators.qml | 3 +--
+ tests/unittests/tst_PhotogridView.qml        | 3 +--
+ tests/unittests/tst_StopWatch.qml            | 3 +--
+ tests/unittests/tst_ViewFinderGeometry.qml   | 3 +--
+ 5 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index faa998c..9d54fbe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -191,6 +191,8 @@ install(DIRECTORY ${QML_DIR}
+     DESTINATION ${CAMERA_APP_DIR}
+     )
+ 
++# For tests
++file(COPY ${QML_DIR} DESTINATION ${CMAKE_BINARY_DIR})
+ 
+ set(ASSETS_DIR assets)
+ 
+diff --git a/tests/unittests/tst_BottomEdgeIndicators.qml b/tests/unittests/tst_BottomEdgeIndicators.qml
+index 129b840..3dd4c0c 100644
+--- a/tests/unittests/tst_BottomEdgeIndicators.qml
++++ b/tests/unittests/tst_BottomEdgeIndicators.qml
+@@ -17,8 +17,7 @@
+ 
+ import QtQuick 2.12
+ import QtTest 1.0
+-import "../../"
+-import "../../.." //Needed for out of source build
++import "../../qml/components"
+ 
+ TestCase {
+     name: "BottomEdgeIndicators"
+diff --git a/tests/unittests/tst_PhotogridView.qml b/tests/unittests/tst_PhotogridView.qml
+index 4c7404a..3f14840 100644
+--- a/tests/unittests/tst_PhotogridView.qml
++++ b/tests/unittests/tst_PhotogridView.qml
+@@ -17,8 +17,7 @@
+ 
+ import QtQuick 2.12
+ import QtTest 1.0
+-import "../../"
+-import "../../.." //Needed for out of source build
++import "../../qml/components"
+ 
+ TestCase {
+     name: "PhotogridView"
+diff --git a/tests/unittests/tst_StopWatch.qml b/tests/unittests/tst_StopWatch.qml
+index aac9c36..5ad29f8 100644
+--- a/tests/unittests/tst_StopWatch.qml
++++ b/tests/unittests/tst_StopWatch.qml
+@@ -17,8 +17,7 @@
+ 
+ import QtQuick 2.12
+ import QtTest 1.0
+-import "../../"
+-import "../../.." //Needed for out of source build
++import "../../qml/components"
+ 
+ TestCase {
+     name: "StopWatch"
+diff --git a/tests/unittests/tst_ViewFinderGeometry.qml b/tests/unittests/tst_ViewFinderGeometry.qml
+index 154437f..42aaacc 100644
+--- a/tests/unittests/tst_ViewFinderGeometry.qml
++++ b/tests/unittests/tst_ViewFinderGeometry.qml
+@@ -17,8 +17,7 @@
+ 
+ import QtQuick 2.12
+ import QtTest 1.0
+-import "../../"
+-import "../../.." //Needed for out of source build
++import "../../qml/Viewfinder"
+ 
+ TestCase {
+     name: "ViewFinderGeometry"
+-- 
+2.49.0
+
diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
index 8238f1fcbdeb..6f48c161d62e 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
@@ -28,15 +28,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-camera-app";
-  version = "4.0.8";
+  version = "4.1.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-camera-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Tkiv0f+1uZKkeyE60G/ThThMyNp+l8q6d4tiKipM3A=";
+    hash = "sha256-rGWIcaU3iFZIse69DUVjCebWH18yVrqWHcGoXItGX3k=";
   };
 
+  patches = [
+    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/234 merged & in release
+    ./1001-treewide-Fix-imports-in-tests-after-QML-files-were-moved.patch
+  ];
+
   # We don't want absolute paths in desktop files
   postPatch = ''
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 5c771772e58a..b1bcd75d3a48 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -5,7 +5,6 @@
   gitUpdater,
   testers,
   accountsservice,
-  ayatana-indicator-datetime,
   biometryd,
   cmake,
   cmake-extras,
@@ -24,6 +23,7 @@
   libqtdbustest,
   libqtdbusmock,
   lomiri-content-hub,
+  lomiri-indicator-datetime,
   lomiri-indicator-network,
   lomiri-schemas,
   lomiri-settings-components,
@@ -121,10 +121,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   # QML components and schemas the wrapper needs
   propagatedBuildInputs = [
-    ayatana-indicator-datetime
     biometryd
     libqofono
     lomiri-content-hub
+    lomiri-indicator-datetime
     lomiri-indicator-network
     lomiri-schemas
     lomiri-settings-components
diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index 1ba3ed098dcc..88242fef27cc 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -7,7 +7,6 @@
   linkFarm,
   replaceVars,
   nixosTests,
-  ayatana-indicator-datetime,
   bash,
   biometryd,
   boost,
@@ -33,6 +32,7 @@
   lomiri-api,
   lomiri-app-launch,
   lomiri-download-manager,
+  lomiri-indicator-datetime,
   lomiri-indicator-network,
   lomiri-notifications,
   lomiri-settings-components,
@@ -119,6 +119,10 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace tests/mocks/CMakeLists.txt \
         --replace-fail 'add_subdirectory(QtMir/Application)' ""
 
+      # This needs to launch the *lomiri* indicators, now that datetime is split into lomiri and non-lomiri variants
+      substituteInPlace data/lomiri-greeter-wrapper \
+        --replace-fail 'ayatana-indicators.target' 'lomiri-indicators.target'
+
       # NixOS-ify
 
       # Use Nix flake instead of Canonical's Ubuntu logo
@@ -143,7 +147,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    ayatana-indicator-datetime
     bash
     boost
     cmake-extras
@@ -163,6 +166,7 @@ stdenv.mkDerivation (finalAttrs: {
     lomiri-api
     lomiri-app-launch
     lomiri-download-manager
+    lomiri-indicator-datetime
     lomiri-indicator-network
     lomiri-schemas
     lomiri-system-settings-unwrapped
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index d5bb64b2893b..893165171bb5 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  ayatana-indicator-datetime,
   libsForQt5,
 }:
 
@@ -63,6 +64,7 @@ let
       hfd-service = callPackage ./services/hfd-service { };
       lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
+      lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
       lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
       lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index 151b24d53f34..be53a63748fe 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -64,6 +64,8 @@ stdenv.mkDerivation rec {
     xf86inputlibinput.dev
   ];
 
+  cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ];
+
   postPatch = ''
     substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \
       --replace-fail 'QStringLiteral("gsettings' \
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 9753bed82150..2ae34f202fd1 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "90beda2aba3cac34052827c560449fcb184c7313";
-      rev-version = "21.0.0-unstable-2025-06-08";
-      sha256 = "sha256-+aTUb9Hg/upulKGLKNpqDYKES62mWkjuLZP07WGnBSc=";
+      rev = "9adde28df784f5c0cc960bdabd413ac131a5852e";
+      rev-version = "21.0.0-unstable-2025-06-15";
+      sha256 = "sha256-8HrUSKL3vOd/Jg9svso9ChCr4tvlGOliyGfi18oZLDY=";
     };
   } // llvmVersions;
 
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index 3e94d49772a0..337ca1e05a92 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -186,11 +186,11 @@ in
 
   saxon_12-he = common rec {
     pname = "saxon-he";
-    version = "12.6";
+    version = "12.7";
     jar = "saxon-he-${version}";
     src = fetchurl {
       url = github.downloadUrl version;
-      hash = "sha256-y7ZlfaBhwVVHatnkOjVkpMySjUlR6+7S6v5aCqdOKu4=";
+      hash = "sha256-+J4ghaw1fZtsuKIxcHrrxff20LTsOmJhRLqWVvdZLN4=";
     };
     updateScript = github.updateScript version;
     description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1";
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index f8ce4771f886..db3445a45604 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -92,14 +92,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcef";
-  version = "136.1.6";
-  gitRevision = "1ac1b14";
-  chromiumVersion = "136.0.7103.114";
+  version = "137.0.17";
+  gitRevision = "f354b0e";
+  chromiumVersion = "137.0.7151.104";
   buildType = "Release";
 
   srcHash = selectSystem {
-    aarch64-linux = "sha256-PC6vwjusN4GQJvwYEuBtXVkwhhdnEePcXR435pRnB6w=";
-    x86_64-linux = "sha256-Uq17X9psYzetSYQvXm62+9+XugCW3tGxnqGVsj6Hogs=";
+    aarch64-linux = "sha256-C9P4+TpzjyMD5z2qLbzubbrIr66usFjRx7QqiAxI2D8=";
+    x86_64-linux = "sha256-iDC3a/YN0NqjX/b2waKvUAZCaR0lkLmUPqBJphE037Q=";
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/prometheus-client-c/default.nix b/pkgs/development/libraries/prometheus-client-c/default.nix
index 340a87666c14..a33e20b7bd5b 100644
--- a/pkgs/development/libraries/prometheus-client-c/default.nix
+++ b/pkgs/development/libraries/prometheus-client-c/default.nix
@@ -68,13 +68,4 @@ rec {
     subdir = "prom";
     description = "Prometheus Client in C";
   };
-  libpromhttp = build {
-    pname = "libpromhttp";
-    subdir = "promhttp";
-    buildInputs = [
-      libmicrohttpd
-      libprom
-    ];
-    description = "Prometheus HTTP Endpoint in C";
-  };
 }
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 900c3bee3574..951d781063fd 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -954,6 +954,20 @@ in
     })
   ) { };
 
+  rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs (oa: {
+
+    doCheck = true;
+    nativeCheckInputs = [
+      final.nlua
+      final.busted
+    ];
+    checkPhase = ''
+      runHook preCheck
+      busted spec
+      runHook postCheck
+    '';
+  });
+
   rtp-nvim = prev.rtp-nvim.overrideAttrs (oa: {
     doCheck = lua.luaversion == "5.1";
     nativeCheckInputs = [
diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix
index 036c528de572..ddc9e2931015 100644
--- a/pkgs/development/ocaml-modules/z3/default.nix
+++ b/pkgs/development/ocaml-modules/z3/default.nix
@@ -36,7 +36,10 @@ else
     '';
 
     nativeBuildInputs = [ findlib ];
-    propagatedBuildInputs = [ zarith ];
+    propagatedBuildInputs = [
+      z3-with-ocaml.lib
+      zarith
+    ];
 
     strictDeps = true;
 
diff --git a/pkgs/development/php-packages/systemd/default.nix b/pkgs/development/php-packages/systemd/default.nix
new file mode 100644
index 000000000000..3aed6066798e
--- /dev/null
+++ b/pkgs/development/php-packages/systemd/default.nix
@@ -0,0 +1,54 @@
+{
+  buildPecl,
+  fetchFromGitHub,
+  fetchpatch,
+  lib,
+  php,
+  runCommand,
+  systemd,
+}:
+
+buildPecl {
+  pname = "systemd";
+  version = "0.1.2-unstable-2018-06-11";
+
+  src = fetchFromGitHub {
+    owner = "systemd";
+    repo = "php-systemd";
+    rev = "22cf92a6b54ef4c5c13c301fc97d7a7b1615ee62";
+    hash = "sha256-UhpE9QXChqKLBqutpQ2Y6neo/ULlJGNojf9DCYJfQMU=";
+  };
+
+  patches = [
+    # Add missing arginfo to suppress the warning
+    # https://github.com/systemd/php-systemd/issues/9
+    (fetchpatch {
+      url = "https://github.com/systemd/php-systemd/commit/0f25ec9aab7747e85445a48213020ea6adda3658.diff";
+      hash = "sha256-SNRYDRxaeP9LlHxfZOak0OSqZ3AJA+I9Ln0k+yO0DvE=";
+    })
+    # Define SD_JOURNAL_SUPPRESS_LOCATION so that the php source code location is used, instead of the C one
+    # https://github.com/systemd/php-systemd/issues/2
+    (fetchpatch {
+      url = "https://github.com/systemd/php-systemd/commit/23575461b8cc55fa9c4132a58393b6438c2aff5c.diff";
+      hash = "sha256-KBGWdNE7spXpqbeS4c2D5IU3Dz8zGxx4r22FDOA0KzM=";
+    })
+  ];
+
+  buildInputs = [ systemd.dev ];
+
+  configureFlags = [ "--with-systemd=${systemd.dev}" ];
+
+  # php will exit with a non-zero exit code, if the extension is not loaded
+  passthru.tests.smokeTest = runCommand "php-systemd-smoke-test" { } ''
+    echo "<?php sd_journal_send('MESSAGE=Hello world.'); ?>" |
+      ${lib.getExe (php.withExtensions ({ all, ... }: [ all.systemd ]))}
+    echo ok > $out
+  '';
+
+  meta = {
+    description = "PHP extension allowing native interaction with systemd and its journal";
+    homepage = "https://github.com/systemd/php-systemd";
+    license = lib.licenses.mit;
+    teams = [ lib.teams.php ];
+  };
+}
diff --git a/pkgs/development/python-modules/altcha/default.nix b/pkgs/development/python-modules/altcha/default.nix
index 5928aa0bce7a..d087445691a7 100644
--- a/pkgs/development/python-modules/altcha/default.nix
+++ b/pkgs/development/python-modules/altcha/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "altcha";
-  version = "0.1.9";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "altcha-org";
     repo = "altcha-lib-py";
     tag = "v${version}";
-    hash = "sha256-54v8c/yp5zhJU151UaTxeJ1FDmbPs2TcfxomrMhFVZc=";
+    hash = "sha256-QZSj24dyfdgAeHSCWcmWKr35VWjGM3kQyh9o77bHOgY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 06cf47b680aa..a20dbd194a45 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -127,12 +127,21 @@ buildPythonPackage rec {
       "test_process_grammar_build_for"
       "test_process_grammar_platform"
       "test_process_grammar_default"
+      "test_create_craft_manifest"
+      "test_create_project_manifest"
+      "test_from_packed_artifact"
+      "test_teardown_session_create_manifest"
     ];
 
-  disabledTestPaths = [
-    # These tests assert outputs of commands that assume Ubuntu-related output.
-    "tests/unit/services/test_lifecycle.py"
-  ];
+  disabledTestPaths =
+    [
+      # These tests assert outputs of commands that assume Ubuntu-related output.
+      "tests/unit/services/test_lifecycle.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+      # Hard-coded assumptions around use of "amd64" arch strings.
+      "tests/unit/services/test_project.py"
+    ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix
index 01e9cb3b7e5d..d65ddd62f18c 100644
--- a/pkgs/development/python-modules/craft-parts/default.nix
+++ b/pkgs/development/python-modules/craft-parts/default.nix
@@ -109,6 +109,8 @@ buildPythonPackage rec {
       # These tests have hardcoded "amd64" strings which fail on aarch64
       "tests/unit/executor/test_environment.py"
       "tests/unit/features/overlay/test_executor_environment.py"
+      # Hard-coded assumptions about arguments relating to 'x86_64'
+      "tests/unit/plugins/test_dotnet_v2_plugin.py"
     ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
index 3000bbdbe448..d0b75e3b85c8 100644
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ b/pkgs/development/python-modules/duckduckgo-search/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "duckduckgo-search";
-  version = "8.0.2";
+  version = "8.0.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "deedy5";
     repo = "duckduckgo_search";
     tag = "v${version}";
-    hash = "sha256-Hbhrm++F6aVvJ//WAgyLNsJe+KS0cjnQ83I1ba72Ows=";
+    hash = "sha256-V7/KvoVNpIrYA9pLd/E6u/mpwPpeFJn1SRlHXUpEzYk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix
index e444dc2705ca..c083572ed019 100644
--- a/pkgs/development/python-modules/horizon-eda/default.nix
+++ b/pkgs/development/python-modules/horizon-eda/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  fetchpatch,
   horizon-eda,
   pycairo,
   python,
@@ -15,13 +16,21 @@ buildPythonPackage {
     version
     src
     meta
-    CASROOT
+    env
     ;
 
   pyproject = false;
 
   disabled = pythonOlder "3.9";
 
+  patches = [
+    # Replaces osmesa with EGL_PLATFORM_SURFACELESS_MESA
+    (fetchpatch {
+      url = "https://github.com/horizon-eda/horizon/commit/663a8adaa1cb7eae7a824de07df8909bc33677c3.patch";
+      hash = "sha256-g0rP9NBDdDijh35Y2h4me9N5R/mjCn+2w7uhnv9bweY=";
+    })
+  ];
+
   buildInputs = base.buildInputs ++ [
     python
   ];
diff --git a/pkgs/development/python-modules/mpltoolbox/default.nix b/pkgs/development/python-modules/mpltoolbox/default.nix
new file mode 100644
index 000000000000..ddada447daf3
--- /dev/null
+++ b/pkgs/development/python-modules/mpltoolbox/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # tests
+  matplotlib,
+  ipympl,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "mpltoolbox";
+  version = "25.04.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scipp";
+    repo = "mpltoolbox";
+    tag = version;
+    hash = "sha256-+LqPTlVbSxuewWuPNUfGdgQjWFxo7s2i3e21WkNNK78=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    matplotlib
+  ];
+
+  nativeCheckInputs = [
+    ipympl
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "mpltoolbox"
+  ];
+
+  meta = {
+    description = "Interactive tools for Matplotlib";
+    homepage = "https://scipp.github.io/mpltoolbox/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 7c6ab2de4854..a42bc1f21173 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.0.16";
+  version = "1.0.17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-t6NGD1IHRHfB2kJT0LwSpCicaan3ptagNDE2JV+IkE4=";
+    hash = "sha256-ZZBgZX6nrcPGlWQeZekCO57rizpuSVBnfoLzjh3r0Fw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix
index 766733b9026b..b51795d7a05c 100644
--- a/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/pkgs/development/python-modules/parsedatetime/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   isPy27,
+  pythonOlder,
   future,
   pytestCheckHook,
 }:
@@ -18,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455";
   };
 
-  propagatedBuildInputs = [ future ];
+  propagatedBuildInputs = lib.optional (pythonOlder "3.13") future;
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pint-xarray/default.nix b/pkgs/development/python-modules/pint-xarray/default.nix
index 5d38fa108940..005f8fed5912 100644
--- a/pkgs/development/python-modules/pint-xarray/default.nix
+++ b/pkgs/development/python-modules/pint-xarray/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pint-xarray";
-  version = "0.4";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xarray-contrib";
     repo = "pint-xarray";
     tag = "v${version}";
-    hash = "sha256-IFHSgrnqS7ZpNhRzzSgHPRUP90WNv84jBH4um/DRMCU=";
+    hash = "sha256-fvVIQagrL1QvIcN/mePx6cT8mbsvx08vu6tGc4tuLwc=";
   };
 
   build-system = [
@@ -44,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Interface for using pint with xarray, providing convenience accessors";
     homepage = "https://github.com/xarray-contrib/pint-xarray";
-    changelog = "https://github.com/xarray-contrib/pint-xarray/blob/v${version}/docs/whats-new.rst";
+    changelog = "https://github.com/xarray-contrib/pint-xarray/blob/${src.tag}/docs/whats-new.rst";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ doronbehar ];
   };
diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix
new file mode 100644
index 000000000000..581dbb51e5d2
--- /dev/null
+++ b/pkgs/development/python-modules/plopp/default.nix
@@ -0,0 +1,117 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
+  lazy-loader,
+  matplotlib,
+
+  # tests
+  pytestCheckHook,
+  anywidget,
+  graphviz,
+  h5py,
+  ipympl,
+  ipywidgets,
+  mpltoolbox,
+  pandas,
+  plotly,
+  pooch,
+  pyarrow,
+  pythreejs,
+  scipp,
+  scipy,
+  xarray,
+
+  # tests data
+  symlinkJoin,
+  fetchurl,
+}:
+
+buildPythonPackage rec {
+  pname = "plopp";
+  version = "25.06.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scipp";
+    repo = "plopp";
+    tag = version;
+    hash = "sha256-SwF0bUU/DAAJ5+0WvZgwqEw6IoaqdbKj0GkCgffGclA=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    lazy-loader
+    matplotlib
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    anywidget
+    graphviz
+    h5py
+    ipympl
+    ipywidgets
+    mpltoolbox
+    pandas
+    plotly
+    pooch
+    pyarrow
+    pythreejs
+    scipp
+    scipy
+    xarray
+  ];
+
+  env = {
+    # See: https://github.com/scipp/plopp/blob/25.05.0/src/plopp/data/examples.py
+    PLOPP_DATA_DIR =
+      let
+        # NOTE this might be changed by upstream in the future.
+        _version = "1";
+      in
+      symlinkJoin {
+        name = "plopp-test-data";
+        paths =
+          lib.mapAttrsToList
+            (
+              file: hash:
+              fetchurl {
+                url = "https://public.esss.dk/groups/scipp/plopp/${_version}/${file}";
+                inherit hash;
+                downloadToTemp = true;
+                recursiveHash = true;
+                postFetch = ''
+                  mkdir -p $out/${_version}
+                  mv $downloadedFile $out/${_version}/${file}
+                '';
+              }
+            )
+            {
+              "nyc_taxi_data.h5" = "sha256-hso8ESM+uLRf4y2CW/7dpAmm/kysAfJY3b+5vz78w4Q=";
+              "teapot.h5" = "sha256-i6hOw72ce1cBT6FMQTdCEKVe0WOMOjApKperGHoPW34=";
+            };
+      };
+  };
+
+  pythonImportsCheck = [
+    "plopp"
+  ];
+
+  meta = {
+    description = "Visualization library for scipp";
+    homepage = "https://scipp.github.io/plopp/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix
index a52dfbc75863..ee6d123f446a 100644
--- a/pkgs/development/python-modules/pyecotrend-ista/default.nix
+++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pythonOlder,
   setuptools,
+  setuptools-scm,
   dataclasses-json,
   requests,
   pytestCheckHook,
@@ -14,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyecotrend-ista";
-  version = "3.3.2";
+  version = "3.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,14 +24,17 @@ buildPythonPackage rec {
     owner = "Ludy87";
     repo = "pyecotrend-ista";
     tag = version;
-    hash = "sha256-TZDHEaDc7UACIAHNX1fStJH74qLKf+krWbTDtemXahA=";
+    hash = "sha256-x9teLjIJPLYi/mE6vy4KBUl7NI4aAwWPYSEwYZQ+4I4=";
   };
 
   postPatch = ''
     sed -i "/addopts =/d" pyproject.toml
   '';
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     dataclasses-json
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index 57456fc256cd..5491f4941941 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -17,6 +17,7 @@
   ffmpeg-full,
   openal,
   libpulseaudio,
+  harfbuzz,
   mesa,
 }:
 
@@ -78,6 +79,8 @@ buildPythonPackage rec {
                   path = '${xorg.libXinerama}/lib/libXinerama${ext}'
               elif name == 'Xxf86vm':
                   path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}'
+              elif name == 'harfbuzz':
+                  path = '${harfbuzz}/lib/libharfbuzz${ext}'
               if path is not None:
                   return ctypes.cdll.LoadLibrary(path)
           raise Exception("Could not load library {}".format(names))
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 49f559a2f3f7..c96eeb0abe0d 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -57,6 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
 
+  # Qt Designer plugin moved to a separate output to reduce closure size
+  # for downstream things
+  outputs = [
+    "out"
+    "devtools"
+  ];
+
   # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
   # reside in the same directory as QtCore.framework, which is not true for Nix.
   # We therefore symLink all required and optional Qt modules in one directory tree ("qt_linked").
@@ -109,6 +116,9 @@ stdenv.mkDerivation (finalAttrs: {
     cd ../../..
     ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6
     cp -r PySide6.egg-info $out/${python.sitePackages}/
+
+    mkdir -p "$devtools"
+    moveToOutput "${python.pkgs.qt6.qtbase.qtPluginPrefix}/designer" "$devtools"
   '';
 
   pythonImportsCheck = [ "PySide6" ];
diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix
index d13c4228bb23..19a9ed79b428 100644
--- a/pkgs/development/python-modules/python-octaviaclient/default.nix
+++ b/pkgs/development/python-modules/python-octaviaclient/default.nix
@@ -30,13 +30,13 @@
 
 buildPythonPackage rec {
   pname = "python-octaviaclient";
-  version = "3.11.0";
+  version = "3.11.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_octaviaclient";
     inherit version;
-    hash = "sha256-IzB40LIn8iW7sO6eB8NgnpFc/vBhfZv4HLMXpgpdP1U=";
+    hash = "sha256-M+JRUMsTq46+UpqSKFzvtRXsaboUKTuqwWs29v09q04=";
   };
 
   # somehow python-neutronclient cannot be found despite it being supplied
diff --git a/pkgs/development/python-modules/scipp/default.nix b/pkgs/development/python-modules/scipp/default.nix
new file mode 100644
index 000000000000..9cfb79fe914a
--- /dev/null
+++ b/pkgs/development/python-modules/scipp/default.nix
@@ -0,0 +1,114 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  scikit-build-core,
+  setuptools,
+  setuptools-scm,
+
+  # nativeBuildInputs
+  cmake,
+  ninja,
+
+  # dependencies
+  numpy,
+  units-llnl,
+
+  # buildInputs
+  boost,
+  eigen,
+  gtest,
+  pybind11,
+  tbb_2022_0,
+
+  # tests
+  pytestCheckHook,
+  scipy,
+  beautifulsoup4,
+  ipython,
+  matplotlib,
+  pandas,
+  numba,
+  xarray,
+  h5py,
+  hypothesis,
+}:
+
+buildPythonPackage rec {
+  pname = "scipp";
+  version = "25.05.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scipp";
+    repo = "Scipp";
+    # https://github.com/scipp/scipp/pull/3722
+    tag = version;
+    hash = "sha256-AanXb+nF/YIZFuzG5UnoNPX97WScfPKuoSBY18uYt9k=";
+  };
+  env = {
+    SKIP_CONAN = "true";
+  };
+
+  build-system = [
+    scikit-build-core
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+  dontUseCmakeConfigure = true;
+
+  dependencies = [
+    numpy
+  ];
+
+  buildInputs = [
+    boost
+    eigen
+    gtest
+    pybind11
+    units-llnl.passthru.top-level
+    tbb_2022_0
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    scipy
+    beautifulsoup4
+    ipython
+    matplotlib
+    pandas
+    numba
+    xarray
+    h5py
+    hypothesis
+  ];
+  pytestFlagsArray = [
+    # See https://github.com/scipp/scipp/issues/3721
+    "--hypothesis-profile=ci"
+  ];
+
+  pythonImportsCheck = [
+    "scipp"
+  ];
+
+  meta = {
+    description = "Multi-dimensional data arrays with labeled dimensions";
+    homepage = "https://scipp.github.io";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    # Got:
+    #
+    #   error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
+    #
+    # Needs debugging along with upstream.
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/development/python-modules/units-llnl/default.nix b/pkgs/development/python-modules/units-llnl/default.nix
new file mode 100644
index 000000000000..03d0cfda1515
--- /dev/null
+++ b/pkgs/development/python-modules/units-llnl/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  units-llnl,
+
+  # build-system
+  nanobind,
+  scikit-build-core,
+
+  # nativeBuildInputs
+  cmake,
+  # NOTE that if top-level units-llnl package uses cmakeFlags other then
+  # Nixpkgs' default, the build might fail, and you'd want to pick only the
+  # cmakeFlags that don't cause a failure. See also:
+  # https://github.com/scipp/scipp/issues/3705
+  cmakeFlags ? units-llnl.cmakeFlags,
+  ninja,
+}:
+
+buildPythonPackage {
+  inherit (units-llnl)
+    pname
+    version
+    src
+    meta
+    ;
+  pyproject = true;
+
+  build-system = [
+    nanobind
+    scikit-build-core
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+  dontUseCmakeConfigure = true;
+  env = {
+    SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" (
+      cmakeFlags
+      ++ [
+        (lib.cmakeBool "UNITS_BUILD_PYTHON_LIBRARY" true)
+      ]
+    );
+  };
+
+  # Also upstream turns off testing for the python build so it seems, see:
+  # https://github.com/LLNL/units/blob/v0.13.1/pyproject.toml#L65-L66 However
+  # they do seem to use pytest for their CI, but in our case it fails due to
+  # missing googletest Python modules, which we don't know how to build.
+  doCheck = false;
+  passthru = {
+    top-level = units-llnl;
+  };
+}
diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix
index ac974171355b..c46d422612ff 100644
--- a/pkgs/development/python-modules/weblate-schemas/default.nix
+++ b/pkgs/development/python-modules/weblate-schemas/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "weblate-schemas";
-  version = "2025.1";
+  version = "2025.2";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_schemas";
     inherit version;
-    hash = "sha256-R2G5s51XmZfc3qewNGv5D9K03pvCFeod4RH4VtY9cAA=";
+    hash = "sha256-C8+p+NHCAbLnHh8ujV5YdbjFSzXsKAoUyNhM3iIRPG4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index 9d4dd766f390..2c624dc3f848 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -114,6 +114,11 @@ stdenv.mkDerivation rec {
         # Unity Bug Reporter specific dependencies
         xorg.libICE
         xorg.libSM
+
+        # Fonts used by built-in and third party editor tools
+        corefonts
+        dejavu_fonts
+        liberation_ttf
       ]
       ++ extraLibs pkgs;
   };
diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix
index 05a75351e9e2..6e8c3b2b4f5c 100644
--- a/pkgs/games/cutechess/default.nix
+++ b/pkgs/games/cutechess/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cutechess";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "cutechess";
     repo = "cutechess";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-P44Twbw2MGz+oTzPwMFCe73zPxAex6uYjSTtaUypfHw=";
+    hash = "sha256-vhS3Eenxcq7D8E5WVON5C5hCTytcEVbYUeuCkfB0apA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 378cc9bb60dd..a0186148e404 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "dxx-rebirth";
-  version = "0.60.0-beta2-unstable-2025-03-29";
+  version = "0.60.0-beta2-unstable-2025-05-24";
 
   src = fetchFromGitHub {
     owner = "dxx-rebirth";
     repo = "dxx-rebirth";
-    rev = "ddc84fa623ed508073cf99244db731bd73f36b6b";
-    hash = "sha256-VZ3PQ4YECM+z+V1zPSNdgIIBFjRIAunEmhENJAUj+P8=";
+    rev = "7a84b3f307ac6f72fd440e55b149d7c2c942dfaf";
+    hash = "sha256-b3rMitf2kw8y0EXwxeKKB8bqzCUaIaMQmpV1gtdcLis=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 14acfe0f2f7f..fd8953071bc2 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -3,7 +3,6 @@
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   fetchurl,
-  libsForQt5,
   qt6Packages,
   cmark,
   gpgme,
@@ -38,6 +37,8 @@ let
           inherit (v) version;
         }
       ) allUrls;
+
+      debugAlias = set: lib.dontRecurseIntoAttrs (lib.filterAttrs (k: v: !v.meta.broken) set);
     in
     (
       qt6Packages
@@ -47,6 +48,11 @@ let
       // {
         inherit sources;
 
+        # Aliases to simplify test-building entire package sets
+        frameworks = debugAlias frameworks;
+        gear = debugAlias gear;
+        plasma = debugAlias plasma;
+
         mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { };
 
         # THIRD PARTY
@@ -62,9 +68,6 @@ let
         # Alias to match metadata
         kquickimageeditor = self.kquickimageedit;
 
-        # Alias because it's just data
-        plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
-
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };
@@ -82,6 +85,7 @@ let
         oxygen-icons = self.callPackage ./misc/oxygen-icons { };
         phonon = self.callPackage ./misc/phonon { };
         phonon-vlc = self.callPackage ./misc/phonon-vlc { };
+        plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { };
         polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { };
         pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { };
 
diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix
index e01f7f6b1896..43dd077fe533 100644
--- a/pkgs/kde/frameworks/breeze-icons/default.nix
+++ b/pkgs/kde/frameworks/breeze-icons/default.nix
@@ -19,4 +19,7 @@ mkKdeDerivation {
 
   # lots of icons, takes forever, does absolutely nothing
   dontStrip = true;
+
+  # known upstream issue: https://invent.kde.org/frameworks/breeze-icons/-/commit/135e59fb4395c1779a52ab113cc70f7baa53fd5d
+  dontCheckForBrokenSymlinks = true;
 }
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
index d0b5c09a101d..a7711db03ddf 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix
@@ -1,16 +1,20 @@
 {
   mkKdeDerivation,
   python3,
+  qttools,
 }:
 mkKdeDerivation {
   pname = "extra-cmake-modules";
 
   outputs = [ "out" ];
 
-  # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
-  # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
   propagatedNativeBuildInputs = [
+    # Packages that have an Android APK (e.g. KWeather) require Python3 at build time.
+    # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57
     python3
+
+    # Most packages require QDoc to generate docs, even if they're not installed
+    (qttools.override { withClang = true; })
   ];
 
   setupHook = ./ecm-hook.sh;
diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
index 10ec8fb85485..51152abbc3a9 100644
--- a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
+++ b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh
@@ -104,10 +104,5 @@ ecmHostPathHook() {
             break
         fi
     done
-
-    if [ -d "$1/share/dbus-1" ]
-    then
-        appendToVar propagatedUserEnvPkgs "$1"
-    fi
 }
 addEnvHooks "$hostOffset" ecmHostPathHook
diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix
index 8a79a0dde1fc..67f0842a7648 100644
--- a/pkgs/kde/frameworks/kapidox/default.nix
+++ b/pkgs/kde/frameworks/kapidox/default.nix
@@ -1,4 +1,7 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kapidox";
+
+  # doesn't actually install anything - good thing it's unused
+  meta.broken = true;
 }
diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix
index d9d15c9592a8..53aaa1dfa0b5 100644
--- a/pkgs/kde/frameworks/karchive/default.nix
+++ b/pkgs/kde/frameworks/karchive/default.nix
@@ -1,15 +1,11 @@
 {
   mkKdeDerivation,
-  qttools,
   pkg-config,
   xz,
 }:
 mkKdeDerivation {
   pname = "karchive";
 
-  extraNativeBuildInputs = [
-    qttools
-    pkg-config
-  ];
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [ xz ];
 }
diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix
index 4ed23d29fd1c..390bf1da4100 100644
--- a/pkgs/kde/frameworks/kauth/default.nix
+++ b/pkgs/kde/frameworks/kauth/default.nix
@@ -1,13 +1,8 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kauth";
 
   # Late resolve paths so things end up in their own prefix
   # FIXME(later): discuss with upstream
   patches = [ ./fix-paths.patch ];
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix
index e52786637ff1..2d93db76edf5 100644
--- a/pkgs/kde/frameworks/kbookmarks/default.nix
+++ b/pkgs/kde/frameworks/kbookmarks/default.nix
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kbookmarks";
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix
index c2649fe03dec..66c0ae45cb0e 100644
--- a/pkgs/kde/frameworks/kcodecs/default.nix
+++ b/pkgs/kde/frameworks/kcodecs/default.nix
@@ -1,13 +1,11 @@
 {
   mkKdeDerivation,
-  qttools,
   gperf,
 }:
 mkKdeDerivation {
   pname = "kcodecs";
 
   extraNativeBuildInputs = [
-    qttools
     gperf
   ];
 }
diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix
index 922182e9280b..c21ebcf00a37 100644
--- a/pkgs/kde/frameworks/kcompletion/default.nix
+++ b/pkgs/kde/frameworks/kcompletion/default.nix
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kcompletion";
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix
index 451ec7db5d28..57844a4ef4f0 100644
--- a/pkgs/kde/frameworks/kconfig/default.nix
+++ b/pkgs/kde/frameworks/kconfig/default.nix
@@ -1,11 +1,9 @@
 {
   mkKdeDerivation,
-  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kconfig";
 
-  extraNativeBuildInputs = [ qttools ];
   extraPropagatedBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix
index 55189f9f544f..38f05b94d7a8 100644
--- a/pkgs/kde/frameworks/kcoreaddons/default.nix
+++ b/pkgs/kde/frameworks/kcoreaddons/default.nix
@@ -1,14 +1,14 @@
 {
   mkKdeDerivation,
-  qttools,
   shared-mime-info,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kcoreaddons";
 
+  hasPythonBindings = true;
+
   extraNativeBuildInputs = [
-    qttools
     shared-mime-info
   ];
   extraBuildInputs = [ qtdeclarative ];
diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix
index c75df4132c0b..86412e584169 100644
--- a/pkgs/kde/frameworks/kdbusaddons/default.nix
+++ b/pkgs/kde/frameworks/kdbusaddons/default.nix
@@ -1,10 +1,5 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kdbusaddons";
-
-  extraNativeBuildInputs = [ qttools ];
   meta.mainProgram = "kquitapp6";
 }
diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix
index ce22856035e3..3f2d6cc5df49 100644
--- a/pkgs/kde/frameworks/kdnssd/default.nix
+++ b/pkgs/kde/frameworks/kdnssd/default.nix
@@ -1,11 +1,9 @@
 {
   mkKdeDerivation,
-  qttools,
   avahi,
 }:
 mkKdeDerivation {
   pname = "kdnssd";
 
-  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ avahi ];
 }
diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix
index 10d40753ae30..d0d45184885c 100644
--- a/pkgs/kde/frameworks/kglobalaccel/default.nix
+++ b/pkgs/kde/frameworks/kglobalaccel/default.nix
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kglobalaccel";
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix
index 7e664e9f70ad..4392d4ad5b44 100644
--- a/pkgs/kde/frameworks/kguiaddons/default.nix
+++ b/pkgs/kde/frameworks/kguiaddons/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "kguiaddons";
 
+  hasPythonBindings = true;
+
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwayland
diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix
index 966ca350c6fd..21284ae13d94 100644
--- a/pkgs/kde/frameworks/kholidays/default.nix
+++ b/pkgs/kde/frameworks/kholidays/default.nix
@@ -1,11 +1,9 @@
 {
   mkKdeDerivation,
-  qttools,
   qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kholidays";
 
-  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix
index 83edf8c52654..b93c82f3a393 100644
--- a/pkgs/kde/frameworks/kirigami/default.nix
+++ b/pkgs/kde/frameworks/kirigami/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   mkKdeDerivation,
   qtsvg,
-  qttools,
   qtdeclarative,
   qt5compat,
   qqc2-desktop-style,
@@ -17,12 +16,11 @@ let
   unwrapped = mkKdeDerivation {
     pname = "kirigami";
 
-    extraNativeBuildInputs = [
-      qtsvg
-      qttools
-    ];
+    extraNativeBuildInputs = [ qtsvg ];
     extraBuildInputs = [ qtdeclarative ];
+
     extraPropagatedBuildInputs = [ qt5compat ];
+    propagatedNativeBuildInputs = [ qt5compat ];
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix
index 487d63092c00..f1d42fec3715 100644
--- a/pkgs/kde/frameworks/kitemviews/default.nix
+++ b/pkgs/kde/frameworks/kitemviews/default.nix
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kitemviews";
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix
index b8b494310f45..d4bcc28c550d 100644
--- a/pkgs/kde/frameworks/kjobwidgets/default.nix
+++ b/pkgs/kde/frameworks/kjobwidgets/default.nix
@@ -1,9 +1,8 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kjobwidgets";
 
-  extraNativeBuildInputs = [ qttools ];
+  # FIXME: depends on kcoreaddons typesystem info, we need
+  # a Shiboken wrapper to propagate this properly.
+  extraCmakeFlags = [ "-DBUILD_PYTHON_BINDINGS=OFF" ];
 }
diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix
index 08b8decea8f0..240f35716a2d 100644
--- a/pkgs/kde/frameworks/knotifications/default.nix
+++ b/pkgs/kde/frameworks/knotifications/default.nix
@@ -1,13 +1,13 @@
 {
   mkKdeDerivation,
-  qttools,
   qtdeclarative,
   libcanberra,
 }:
 mkKdeDerivation {
   pname = "knotifications";
 
-  extraNativeBuildInputs = [ qttools ];
+  hasPythonBindings = true;
+
   extraBuildInputs = [
     qtdeclarative
     libcanberra
diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
index e6845ef56985..86cd9263aa20 100644
--- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
+++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix
@@ -1,9 +1,6 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kstatusnotifieritem";
 
-  extraNativeBuildInputs = [ qttools ];
+  hasPythonBindings = true;
 }
diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix
index e7c470c99d09..2aec466ec92e 100644
--- a/pkgs/kde/frameworks/ktexteditor/default.nix
+++ b/pkgs/kde/frameworks/ktexteditor/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "ktexteditor";
 
+  extraNativeBuildInputs = [ qtspeech ];
+
   extraBuildInputs = [
     qtdeclarative
     qtspeech
diff --git a/pkgs/kde/frameworks/ktextwidgets/default.nix b/pkgs/kde/frameworks/ktextwidgets/default.nix
index a90de215c598..78d041d38c95 100644
--- a/pkgs/kde/frameworks/ktextwidgets/default.nix
+++ b/pkgs/kde/frameworks/ktextwidgets/default.nix
@@ -6,6 +6,8 @@
 mkKdeDerivation {
   pname = "ktextwidgets";
 
+  extraNativeBuildInputs = [ qtspeech ];
+
   extraBuildInputs = [
     qtspeech
     qttools
diff --git a/pkgs/kde/frameworks/kunitconversion/default.nix b/pkgs/kde/frameworks/kunitconversion/default.nix
index 544aebb871f3..61c7b83f687a 100644
--- a/pkgs/kde/frameworks/kunitconversion/default.nix
+++ b/pkgs/kde/frameworks/kunitconversion/default.nix
@@ -1,4 +1,6 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kunitconversion";
+
+  hasPythonBindings = true;
 }
diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix
index 7379061982b5..c441c1cc8b89 100644
--- a/pkgs/kde/frameworks/kuserfeedback/default.nix
+++ b/pkgs/kde/frameworks/kuserfeedback/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  qttools,
   qtsvg,
 }:
 mkKdeDerivation {
@@ -11,8 +10,5 @@ mkKdeDerivation {
     "-DENABLE_CONSOLE=0"
     "-DENABLE_CLI=0"
   ];
-  extraNativeBuildInputs = [
-    qttools
-    qtsvg
-  ];
+  extraNativeBuildInputs = [ qtsvg ];
 }
diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix
index 00e9adca5b2f..4784d4696ea9 100644
--- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix
+++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix
@@ -1,9 +1,6 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kwidgetsaddons";
 
-  extraNativeBuildInputs = [ qttools ];
+  hasPythonBindings = true;
 }
diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix
index 5ae167b1cc9a..fb4349a53654 100644
--- a/pkgs/kde/frameworks/kwindowsystem/default.nix
+++ b/pkgs/kde/frameworks/kwindowsystem/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  qttools,
   qtdeclarative,
   qtwayland,
   pkg-config,
@@ -9,7 +8,6 @@ mkKdeDerivation {
   pname = "kwindowsystem";
 
   extraNativeBuildInputs = [
-    qttools
     pkg-config
   ];
   extraBuildInputs = [
diff --git a/pkgs/kde/frameworks/kxmlgui/default.nix b/pkgs/kde/frameworks/kxmlgui/default.nix
index 3b93b5b35146..a1bed1f0bfbb 100644
--- a/pkgs/kde/frameworks/kxmlgui/default.nix
+++ b/pkgs/kde/frameworks/kxmlgui/default.nix
@@ -5,5 +5,7 @@
 mkKdeDerivation {
   pname = "kxmlgui";
 
+  hasPythonBindings = true;
+
   extraBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix
index 4cde20f930b0..5723075389ca 100644
--- a/pkgs/kde/frameworks/prison/default.nix
+++ b/pkgs/kde/frameworks/prison/default.nix
@@ -8,9 +8,11 @@
 mkKdeDerivation {
   pname = "prison";
 
+  propagatedNativeBuildInputs = [ qtmultimedia ];
+  extraPropagatedBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtdeclarative
-    qtmultimedia
     qrencode
     libdmtx
   ];
diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
index 45f22d8fa5d3..469f4b23f1b9 100644
--- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
+++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix
@@ -1,13 +1,11 @@
 {
   mkKdeDerivation,
   qtdeclarative,
-  qttools,
   kirigami,
 }:
 mkKdeDerivation {
   pname = "qqc2-desktop-style";
 
-  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [
     qtdeclarative
     kirigami.unwrapped
diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix
index 6b767e9d43f7..51c4be689aeb 100644
--- a/pkgs/kde/frameworks/solid/default.nix
+++ b/pkgs/kde/frameworks/solid/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  qttools,
   bison,
   flex,
   libimobiledevice,
@@ -14,7 +13,6 @@ mkKdeDerivation {
   ];
 
   extraNativeBuildInputs = [
-    qttools
     bison
     flex
   ];
diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix
index fbeb8b10d555..329f532a710c 100644
--- a/pkgs/kde/frameworks/sonnet/default.nix
+++ b/pkgs/kde/frameworks/sonnet/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   qtdeclarative,
-  qttools,
   pkg-config,
   aspell,
   hunspell,
@@ -9,10 +8,7 @@
 mkKdeDerivation {
   pname = "sonnet";
 
-  extraNativeBuildInputs = [
-    qttools
-    pkg-config
-  ];
+  extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtdeclarative
     aspell
diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix
index 7985dcb95702..0b92eb7eccdc 100644
--- a/pkgs/kde/frameworks/syntax-highlighting/default.nix
+++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix
@@ -1,16 +1,12 @@
 {
   mkKdeDerivation,
   qtdeclarative,
-  qttools,
   perl,
 }:
 mkKdeDerivation {
   pname = "syntax-highlighting";
 
   extraBuildInputs = [ qtdeclarative ];
-  extraNativeBuildInputs = [
-    qttools
-    perl
-  ];
+  extraNativeBuildInputs = [ perl ];
   meta.mainProgram = "ksyntaxhighlighter6";
 }
diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix
index 6225b7e9cfda..843055db79d3 100644
--- a/pkgs/kde/gear/akonadi/default.nix
+++ b/pkgs/kde/gear/akonadi/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   mkKdeDerivation,
-  qttools,
   accounts-qt,
   kaccounts-integration,
   shared-mime-info,
@@ -36,7 +35,6 @@ mkKdeDerivation {
     ];
 
   extraNativeBuildInputs = [
-    qttools
     shared-mime-info
   ];
 
diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix
index 4402ab1d5300..971c2f78f74d 100644
--- a/pkgs/kde/gear/analitza/default.nix
+++ b/pkgs/kde/gear/analitza/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qt5compat,
   qtsvg,
-  qttools,
   qtdeclarative,
   eigen,
 }:
@@ -12,7 +11,6 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     qt5compat
     qtsvg
-    qttools
   ];
   extraBuildInputs = [
     qtdeclarative
diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index 49c578b1c3d3..d18ca798d832 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -23,6 +23,7 @@ mkKdeDerivation rec {
     rustPlatform.cargoSetupHook
     cargo
     rustc
+    qtwebengine
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix
index 247da11b6d3d..a974f6429fa2 100644
--- a/pkgs/kde/gear/arianna/default.nix
+++ b/pkgs/kde/gear/arianna/default.nix
@@ -9,6 +9,12 @@
 mkKdeDerivation {
   pname = "arianna";
 
+  extraNativeBuildInputs = [
+    qthttpserver
+    qtwebchannel
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qthttpserver
     qtsvg
@@ -16,5 +22,6 @@ mkKdeDerivation {
     qtwebengine
     kitemmodels
   ];
+
   meta.mainProgram = "arianna";
 }
diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix
index b27ab60155a5..ae79dc7ae25a 100644
--- a/pkgs/kde/gear/audiotube/default.nix
+++ b/pkgs/kde/gear/audiotube/default.nix
@@ -27,6 +27,7 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [
     ps.pybind11
+    qtmultimedia
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix
index 885384e3f71b..bcde9b5a8a82 100644
--- a/pkgs/kde/gear/blinken/default.nix
+++ b/pkgs/kde/gear/blinken/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "blinken";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
+
   meta.mainProgram = "blinken";
 }
diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix
index 6269359ae178..159ae9946c9b 100644
--- a/pkgs/kde/gear/cantor/default.nix
+++ b/pkgs/kde/gear/cantor/default.nix
@@ -19,7 +19,9 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
+    qtwebengine
   ];
+
   extraBuildInputs = [
     qtsvg
     qttools
diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix
index a825f60421b9..db28172a7dfe 100644
--- a/pkgs/kde/gear/dragon/default.nix
+++ b/pkgs/kde/gear/dragon/default.nix
@@ -1,5 +1,19 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kconfigwidgets,
+  kparts,
+  kxmlgui,
+  phonon,
+}:
 mkKdeDerivation {
   pname = "dragon";
+
+  extraBuildInputs = [
+    kconfigwidgets
+    kparts
+    kxmlgui
+    phonon
+  ];
+
   meta.mainProgram = "dragon";
 }
diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix
index ee280ae93198..9162502e8460 100644
--- a/pkgs/kde/gear/elisa/default.nix
+++ b/pkgs/kde/gear/elisa/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "elisa";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtmultimedia
     libvlc
   ];
+
   meta.mainProgram = "elisa";
 }
diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix
index a4fad195a7b0..d5d3ffa3797d 100644
--- a/pkgs/kde/gear/falkon/default.nix
+++ b/pkgs/kde/gear/falkon/default.nix
@@ -3,14 +3,12 @@
   extra-cmake-modules,
   qtwebchannel,
   qtwebengine,
-  qttools,
   python3Packages,
 }:
 mkKdeDerivation {
   pname = "falkon";
 
   extraNativeBuildInputs = [
-    qttools
     qtwebchannel
     qtwebengine
   ];
diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix
index 1bcb0e004050..8493e180266c 100644
--- a/pkgs/kde/gear/ghostwriter/default.nix
+++ b/pkgs/kde/gear/ghostwriter/default.nix
@@ -16,7 +16,12 @@
 mkKdeDerivation {
   pname = "ghostwriter";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwebchannel
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtsvg
     qttools
diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix
index 71780b6bf9a7..f237c341ea45 100644
--- a/pkgs/kde/gear/gwenview/default.nix
+++ b/pkgs/kde/gear/gwenview/default.nix
@@ -3,6 +3,7 @@
   qtsvg,
   qtwayland,
   qtimageformats,
+  phonon,
   pkg-config,
   cfitsio,
   exiv2,
@@ -14,13 +15,19 @@
 mkKdeDerivation {
   pname = "gwenview";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwayland
+  ];
+
   extraBuildInputs = [
     qtsvg
     qtwayland
     # adds support for webp and other image formats
     qtimageformats
 
+    phonon
+
     cfitsio
     exiv2
     baloo
diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix
index 0b2292a2ada3..07b338520eb2 100644
--- a/pkgs/kde/gear/itinerary/default.nix
+++ b/pkgs/kde/gear/itinerary/default.nix
@@ -15,11 +15,14 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
+    qtpositioning
   ];
+
   extraBuildInputs = [
     qtlocation
     qtpositioning
     libical
   ];
+
   meta.mainProgram = "itinerary";
 }
diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix
index c0bc805639a4..4ef36a9a6b14 100644
--- a/pkgs/kde/gear/juk/default.nix
+++ b/pkgs/kde/gear/juk/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   qtsvg,
+  phonon,
   taglib,
 }:
 mkKdeDerivation {
@@ -8,7 +9,9 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     qtsvg
+    phonon
     taglib
   ];
+
   meta.mainProgram = "juk";
 }
diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix
index 06b4630863f1..0d30264167cb 100644
--- a/pkgs/kde/gear/k3b/default.nix
+++ b/pkgs/kde/gear/k3b/default.nix
@@ -27,6 +27,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
+    qtwebengine
   ];
 
   # FIXME: Musicbrainz 2.x???, musepack
diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix
index bf0ecf678302..ac11b02a3bc5 100644
--- a/pkgs/kde/gear/kaccounts-providers/default.nix
+++ b/pkgs/kde/gear/kaccounts-providers/default.nix
@@ -7,7 +7,11 @@
 mkKdeDerivation {
   pname = "kaccounts-providers";
 
-  extraNativeBuildInputs = [ intltool ];
+  extraNativeBuildInputs = [
+    intltool
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtdeclarative
     qtwebengine
diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix
index 1b3cd47fc93e..db6b5ba77b8e 100644
--- a/pkgs/kde/gear/kalgebra/default.nix
+++ b/pkgs/kde/gear/kalgebra/default.nix
@@ -8,6 +8,8 @@
 mkKdeDerivation {
   pname = "kalgebra";
 
+  extraNativeBuildInputs = [ qtwebengine ];
+
   extraBuildInputs = [
     qtsvg
     qtwebengine
diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix
index 7cdcd1efec63..f8e5672a7bcd 100644
--- a/pkgs/kde/gear/kalzium/default.nix
+++ b/pkgs/kde/gear/kalzium/default.nix
@@ -14,12 +14,15 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     ocaml
+    qtscxml
   ];
+
   extraBuildInputs = [
     eigen
     openbabel
     qtsvg
     qtscxml
   ];
+
   meta.mainProgram = "kalzium";
 }
diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix
index f95ea1c80892..9d56452c3d7a 100644
--- a/pkgs/kde/gear/kasts/default.nix
+++ b/pkgs/kde/gear/kasts/default.nix
@@ -9,7 +9,11 @@
 mkKdeDerivation {
   pname = "kasts";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtmultimedia
+  ];
+
   extraBuildInputs = [
     qtsvg
     qtmultimedia
diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix
index d657c059ca22..c161a0ec5b9c 100644
--- a/pkgs/kde/gear/kcachegrind/default.nix
+++ b/pkgs/kde/gear/kcachegrind/default.nix
@@ -1,14 +1,11 @@
 {
   lib,
   mkKdeDerivation,
-  qttools,
   graphviz,
 }:
 mkKdeDerivation {
   pname = "kcachegrind";
 
-  extraNativeBuildInputs = [ qttools ];
-
   qtWrapperArgs = [
     "--suffix PATH : ${lib.makeBinPath [ graphviz ]}"
   ];
diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix
index 56ec55e885da..0ea54cf45b88 100644
--- a/pkgs/kde/gear/kclock/default.nix
+++ b/pkgs/kde/gear/kclock/default.nix
@@ -6,6 +6,8 @@
 mkKdeDerivation {
   pname = "kclock";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtsvg
     qtmultimedia
diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix
index d81c487e452f..eaba370102c7 100644
--- a/pkgs/kde/gear/kdeconnect-kde/default.nix
+++ b/pkgs/kde/gear/kdeconnect-kde/default.nix
@@ -26,7 +26,13 @@ mkKdeDerivation {
     echo "${sshfs}" > $out/nix-support/depends
   '';
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtconnectivity
+    qtmultimedia
+    qtwayland
+  ];
+
   extraBuildInputs = [
     qtconnectivity
     qtmultimedia
diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
index 56596b0537f6..84cf2576d704 100644
--- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
+++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix
@@ -5,5 +5,6 @@
 mkKdeDerivation {
   pname = "kdegraphics-mobipocket";
 
+  extraNativeBuildInputs = [ qt5compat ];
   extraBuildInputs = [ qt5compat ];
 }
diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix
index eaddc66b65f2..a7b9aa7f6764 100644
--- a/pkgs/kde/gear/kdenlive/default.nix
+++ b/pkgs/kde/gear/kdenlive/default.nix
@@ -32,6 +32,7 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     shared-mime-info
+    qtnetworkauth
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix
index e3cd581afcd5..42cd2a751a51 100644
--- a/pkgs/kde/gear/kdepim-runtime/default.nix
+++ b/pkgs/kde/gear/kdepim-runtime/default.nix
@@ -18,7 +18,9 @@ mkKdeDerivation {
     pkg-config
     shared-mime-info
     libxslt
+    qtnetworkauth
   ];
+
   # FIXME: libkolabxml
   extraBuildInputs = [
     qtnetworkauth
diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix
index 23901bb4d78e..b175af1d7194 100644
--- a/pkgs/kde/gear/kdev-python/default.nix
+++ b/pkgs/kde/gear/kdev-python/default.nix
@@ -1,4 +1,6 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+}:
 mkKdeDerivation {
   pname = "kdev-python";
 }
diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix
index 5a2b02b41530..e4def55487c7 100644
--- a/pkgs/kde/gear/kdevelop/default.nix
+++ b/pkgs/kde/gear/kdevelop/default.nix
@@ -23,10 +23,6 @@ mkKdeDerivation {
     shared-mime-info
   ];
 
-  extraPropagatedBuildInputs = [
-    qtwebengine
-  ];
-
   extraBuildInputs = [
     qttools
     apr
@@ -38,6 +34,9 @@ mkKdeDerivation {
     subversion
   ];
 
+  propagatedNativeBuildInputs = [ qtwebengine ];
+  extraPropagatedBuildInputs = [ qtwebengine ];
+
   extraCmakeFlags = [
     "-DCLANG_BUILTIN_DIR=${lib.getLib libclang}/lib/clang/${lib.versions.major libclang.version}/include"
     "-DAPR_CONFIG_PATH=${apr.dev}/bin"
diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix
index 560d4685921a..96cf05526b15 100644
--- a/pkgs/kde/gear/kgraphviewer/default.nix
+++ b/pkgs/kde/gear/kgraphviewer/default.nix
@@ -9,7 +9,11 @@
 mkKdeDerivation {
   pname = "kgraphviewer";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qt5compat
+  ];
+
   extraBuildInputs = [
     qt5compat
     qtsvg
diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix
index 795ec3b4aeb3..1e849647e803 100644
--- a/pkgs/kde/gear/khelpcenter/default.nix
+++ b/pkgs/kde/gear/khelpcenter/default.nix
@@ -10,16 +10,22 @@
 mkKdeDerivation {
   pname = "khelpcenter";
 
+  patches = [
+    (replaceVars ./use_nix_paths_for_mansearch_utilities.patch {
+      inherit man-db;
+    })
+  ];
+
+  extraNativeBuildInputs = [
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtwebengine
     xapian
     python3
     kio-extras
   ];
-  patches = [
-    (replaceVars ./use_nix_paths_for_mansearch_utilities.patch {
-      inherit man-db;
-    })
-  ];
+
   meta.mainProgram = "khelpcenter";
 }
diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix
index 9341cf5ab4db..af57c792bdc2 100644
--- a/pkgs/kde/gear/kimagemapeditor/default.nix
+++ b/pkgs/kde/gear/kimagemapeditor/default.nix
@@ -5,6 +5,8 @@
 mkKdeDerivation {
   pname = "kimagemapeditor";
 
+  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
+
   meta.mainProgram = "kimagemapeditor";
 }
diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix
index bb739046baca..f99fd3e1fca6 100644
--- a/pkgs/kde/gear/kirigami-gallery/default.nix
+++ b/pkgs/kde/gear/kirigami-gallery/default.nix
@@ -1,13 +1,9 @@
 {
   mkKdeDerivation,
   qtsvg,
-  qttools,
 }:
 mkKdeDerivation {
   pname = "kirigami-gallery";
 
-  extraNativeBuildInputs = [
-    qtsvg
-    qttools
-  ];
+  extraNativeBuildInputs = [ qtsvg ];
 }
diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix
index 70dd2dbcec72..c8aed6950e08 100644
--- a/pkgs/kde/gear/klettres/default.nix
+++ b/pkgs/kde/gear/klettres/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "klettres";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtmultimedia
     qtsvg
   ];
+
   meta.mainProgram = "klettres";
 }
diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix
index 300185643481..4f1fcbea3500 100644
--- a/pkgs/kde/gear/kmime/default.nix
+++ b/pkgs/kde/gear/kmime/default.nix
@@ -1,11 +1,9 @@
 {
   mkKdeDerivation,
-  qttools,
   ki18n,
 }:
 mkKdeDerivation {
   pname = "kmime";
 
-  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ ki18n ];
 }
diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix
index 7eca9ab12c73..c07a0c4ebd0c 100644
--- a/pkgs/kde/gear/kmousetool/default.nix
+++ b/pkgs/kde/gear/kmousetool/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "kmousetool";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtmultimedia
     xorg.libXt
   ];
+
   meta.mainProgram = "kmousetool";
 }
diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix
index 098f8a5ec33f..60235bea24f3 100644
--- a/pkgs/kde/gear/kmouth/default.nix
+++ b/pkgs/kde/gear/kmouth/default.nix
@@ -5,6 +5,8 @@
 mkKdeDerivation {
   pname = "kmouth";
 
+  extraNativeBuildInputs = [ qtspeech ];
   extraBuildInputs = [ qtspeech ];
+
   meta.mainProgram = "kmouth";
 }
diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix
index 613f2981fe52..a2a5b443c49d 100644
--- a/pkgs/kde/gear/koko/default.nix
+++ b/pkgs/kde/gear/koko/default.nix
@@ -37,7 +37,11 @@ mkKdeDerivation {
     ./optional-runtime-dependencies.patch
   ];
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtpositioning
+  ];
+
   extraBuildInputs = [
     qtmultimedia
     qtpositioning
diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix
index 5bd29359e979..61bcd13ec059 100644
--- a/pkgs/kde/gear/konqueror/default.nix
+++ b/pkgs/kde/gear/konqueror/default.nix
@@ -6,7 +6,11 @@
 mkKdeDerivation {
   pname = "konqueror";
 
-  extraNativeBuildInputs = [ hunspell ];
+  extraNativeBuildInputs = [
+    hunspell
+    qtwebengine
+  ];
+
   extraBuildInputs = [ qtwebengine ];
 
   extraCmakeFlags = [
diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix
index 3b7cfbf59e54..61569d7aeaf1 100644
--- a/pkgs/kde/gear/konquest/default.nix
+++ b/pkgs/kde/gear/konquest/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "konquest";
 
+  extraNativeBuildInputs = [ qtscxml ];
+
   extraBuildInputs = [
     qtscxml
     qtsvg
   ];
+
   meta.mainProgram = "konquest";
 }
diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix
index 0e95e6a045a8..a1c225e723b5 100644
--- a/pkgs/kde/gear/konsole/default.nix
+++ b/pkgs/kde/gear/konsole/default.nix
@@ -6,6 +6,8 @@
 mkKdeDerivation {
   pname = "konsole";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qt5compat
     qtmultimedia
diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix
index b78bb62f62fc..e2e59d5d2303 100644
--- a/pkgs/kde/gear/konversation/default.nix
+++ b/pkgs/kde/gear/konversation/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  qttools,
   qtmultimedia,
   qt5compat,
 }:
@@ -8,10 +7,7 @@ mkKdeDerivation {
   pname = "konversation";
 
   extraBuildInputs = [ qt5compat ];
-  extraNativeBuildInputs = [
-    qtmultimedia
-    qttools
-  ];
+  extraNativeBuildInputs = [ qtmultimedia ];
 
   meta.mainProgram = "konversation";
 }
diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix
index 04d9d4c05826..5b6a973c9c3e 100644
--- a/pkgs/kde/gear/krecorder/default.nix
+++ b/pkgs/kde/gear/krecorder/default.nix
@@ -5,6 +5,8 @@
 mkKdeDerivation {
   pname = "krecorder";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
+
   meta.mainProgram = "krecorder";
 }
diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix
index 2123d3d54abf..3e96b6eb60d6 100644
--- a/pkgs/kde/gear/ksirk/default.nix
+++ b/pkgs/kde/gear/ksirk/default.nix
@@ -5,5 +5,6 @@
 mkKdeDerivation {
   pname = "ksirk";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
 }
diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix
index ae1d8aedfdf3..359e80872fbe 100644
--- a/pkgs/kde/gear/ktorrent/default.nix
+++ b/pkgs/kde/gear/ktorrent/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "ktorrent";
 
+  extraNativeBuildInputs = [ qtwebengine ];
+
   extraBuildInputs = [
     qtwebengine
     taglib
diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix
index 278f7f823d3d..4d953b535760 100644
--- a/pkgs/kde/gear/ktuberling/default.nix
+++ b/pkgs/kde/gear/ktuberling/default.nix
@@ -5,6 +5,8 @@
 mkKdeDerivation {
   pname = "ktuberling";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
   extraBuildInputs = [ qtmultimedia ];
+
   meta.mainProgram = "ktuberling";
 }
diff --git a/pkgs/kde/gear/kunifiedpush/default.nix b/pkgs/kde/gear/kunifiedpush/default.nix
index ccecbca0f2a3..97822e31e225 100644
--- a/pkgs/kde/gear/kunifiedpush/default.nix
+++ b/pkgs/kde/gear/kunifiedpush/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "kunifiedpush";
 
+  extraNativeBuildInputs = [ qtwebsockets ];
+
   extraBuildInputs = [
     qtwebsockets
     kdeclarative
diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix
index e7fbff9937ca..bb2fcea752bd 100644
--- a/pkgs/kde/gear/kwave/default.nix
+++ b/pkgs/kde/gear/kwave/default.nix
@@ -19,7 +19,11 @@
 mkKdeDerivation {
   pname = "kwave";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtmultimedia
+  ];
+
   extraBuildInputs = [
     qtmultimedia
 
diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix
index 20d4c8a1e670..a77d37b9c9ba 100644
--- a/pkgs/kde/gear/kweather/default.nix
+++ b/pkgs/kde/gear/kweather/default.nix
@@ -7,10 +7,13 @@
 mkKdeDerivation {
   pname = "kweather";
 
+  extraNativeBuildInputs = [ qtcharts ];
+
   extraBuildInputs = [
     qtsvg
     qtcharts
     kholidays
   ];
+
   meta.mainProgram = "kweather";
 }
diff --git a/pkgs/kde/gear/kweathercore/default.nix b/pkgs/kde/gear/kweathercore/default.nix
index ca45515dfdb8..852e97237490 100644
--- a/pkgs/kde/gear/kweathercore/default.nix
+++ b/pkgs/kde/gear/kweathercore/default.nix
@@ -5,5 +5,6 @@
 mkKdeDerivation {
   pname = "kweathercore";
 
+  extraNativeBuildInputs = [ qtpositioning ];
   extraBuildInputs = [ qtpositioning ];
 }
diff --git a/pkgs/kde/gear/kwordquiz/default.nix b/pkgs/kde/gear/kwordquiz/default.nix
index ad57c8e2d71b..d2a11b4c8d96 100644
--- a/pkgs/kde/gear/kwordquiz/default.nix
+++ b/pkgs/kde/gear/kwordquiz/default.nix
@@ -6,9 +6,12 @@
 mkKdeDerivation {
   pname = "kwordquiz";
 
+  extraNativeBuildInputs = [ qtmultimedia ];
+
   extraBuildInputs = [
     qtsvg
     qtmultimedia
   ];
+
   meta.mainProgram = "kwordquiz";
 }
diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix
index fc9d3f3d637c..6c39a9db3ef5 100644
--- a/pkgs/kde/gear/libkdepim/default.nix
+++ b/pkgs/kde/gear/libkdepim/default.nix
@@ -1,9 +1,4 @@
-{
-  mkKdeDerivation,
-  qttools,
-}:
+{ mkKdeDerivation }:
 mkKdeDerivation {
   pname = "libkdepim";
-
-  extraNativeBuildInputs = [ qttools ];
 }
diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix
index e36d8995687e..187ef29419e6 100644
--- a/pkgs/kde/gear/libksieve/default.nix
+++ b/pkgs/kde/gear/libksieve/default.nix
@@ -6,6 +6,8 @@
 mkKdeDerivation {
   pname = "libksieve";
 
+  extraNativeBuildInputs = [ qtwebengine ];
+
   extraBuildInputs = [
     qtwebengine
     cyrus_sasl
diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix
index 9c3723815d51..3cf83babad2a 100644
--- a/pkgs/kde/gear/marble/default.nix
+++ b/pkgs/kde/gear/marble/default.nix
@@ -6,6 +6,7 @@
   shared-mime-info,
 
   qtpositioning,
+  qtserialport,
   qtsvg,
   qttools,
   qtwebengine,
@@ -25,10 +26,14 @@ mkKdeDerivation {
     perl
     pkg-config
     shared-mime-info
+    qtpositioning
+    qtserialport
+    qtwebengine
   ];
 
   extraBuildInputs = [
     qtpositioning
+    qtserialport
     qtsvg
     qttools
     qtwebengine
diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix
index 04b958217e74..18253915a8ab 100644
--- a/pkgs/kde/gear/massif-visualizer/default.nix
+++ b/pkgs/kde/gear/massif-visualizer/default.nix
@@ -7,9 +7,13 @@
 mkKdeDerivation {
   pname = "massif-visualizer";
 
+  extraNativeBuildInputs = [
+    shared-mime-info
+    qt5compat
+  ];
+
   extraBuildInputs = [
     qt5compat
     qtsvg
   ];
-  extraNativeBuildInputs = [ shared-mime-info ];
 }
diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix
index a6a2c70c5732..c45635087f88 100644
--- a/pkgs/kde/gear/merkuro/default.nix
+++ b/pkgs/kde/gear/merkuro/default.nix
@@ -7,6 +7,8 @@
 mkKdeDerivation {
   pname = "merkuro";
 
+  extraNativeBuildInputs = [ qtlocation ];
+
   extraBuildInputs = [
     qtlocation
     qtsvg
diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix
index db8f4e04f045..e68c343ff1b7 100644
--- a/pkgs/kde/gear/messagelib/default.nix
+++ b/pkgs/kde/gear/messagelib/default.nix
@@ -5,5 +5,6 @@
 mkKdeDerivation {
   pname = "messagelib";
 
+  propagatedNativeBuildInputs = [ qtwebengine ];
   extraPropagatedBuildInputs = [ qtwebengine ];
 }
diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix
index 56c96f2245ff..ed064857e5f9 100644
--- a/pkgs/kde/gear/neochat/default.nix
+++ b/pkgs/kde/gear/neochat/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qtlocation,
   qtwebview,
-  kunifiedpush,
 }:
 mkKdeDerivation {
   pname = "neochat";
@@ -10,7 +9,6 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtlocation
     qtwebview
-    kunifiedpush
   ];
   meta.mainProgram = "neochat";
 }
diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix
index b6048d9611d4..d64404b4ed8f 100644
--- a/pkgs/kde/gear/okular/default.nix
+++ b/pkgs/kde/gear/okular/default.nix
@@ -14,7 +14,11 @@
 mkKdeDerivation {
   pname = "okular";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtspeech
+  ];
+
   extraBuildInputs = [
     qtspeech
     qtsvg
diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix
index e2a275c4c02c..437f85c97cc3 100644
--- a/pkgs/kde/gear/parley/default.nix
+++ b/pkgs/kde/gear/parley/default.nix
@@ -7,10 +7,16 @@
 mkKdeDerivation {
   pname = "parley";
 
+  extraNativeBuildInputs = [
+    qtmultimedia
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtsvg
     qtmultimedia
     qtwebengine
   ];
+
   meta.mainProgram = "parley";
 }
diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix
index 4c9e10422098..69b622bc264b 100644
--- a/pkgs/kde/gear/skanpage/default.nix
+++ b/pkgs/kde/gear/skanpage/default.nix
@@ -8,10 +8,15 @@
 mkKdeDerivation {
   pname = "skanpage";
 
+  extraNativeBuildInputs = [
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtwebengine
     (tesseract5.override { enableLanguages = tesseractLanguages; })
     leptonica
   ];
+
   meta.mainProgram = "skanpage";
 }
diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix
index 983755d21139..4c5283bde774 100644
--- a/pkgs/kde/gear/step/default.nix
+++ b/pkgs/kde/gear/step/default.nix
@@ -1,6 +1,5 @@
 {
   mkKdeDerivation,
-  qttools,
   qtsvg,
   pkg-config,
   eigen,
@@ -12,7 +11,6 @@ mkKdeDerivation {
   pname = "step";
 
   extraNativeBuildInputs = [
-    qttools
     qtsvg
     pkg-config
     shared-mime-info
diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix
index 467ebc2837e6..c38d4eec3aad 100644
--- a/pkgs/kde/gear/tokodon/default.nix
+++ b/pkgs/kde/gear/tokodon/default.nix
@@ -10,7 +10,11 @@
 mkKdeDerivation {
   pname = "tokodon";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwebsockets
+  ];
+
   extraBuildInputs = [
     qtmultimedia
     qtsvg
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index cadebb1f0d8c..a2a8f6c02a6d 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -49,6 +49,7 @@
       "extra-cmake-modules",
       "grantleetheme",
       "kcodecs",
+      "kcolorscheme",
       "kcontacts",
       "kmime",
       "ktextaddons",
@@ -251,8 +252,20 @@
       "kcrash",
       "ki18n",
       "kirigami",
+      "kitemmodels",
       "knewstuff"
     ],
+    "atcore": [
+      "extra-cmake-modules"
+    ],
+    "atelier": [
+      "atcore",
+      "extra-cmake-modules",
+      "kconfig",
+      "ki18n",
+      "ktexteditor",
+      "kxmlgui"
+    ],
     "atlantik": [
       "extra-cmake-modules",
       "kconfig",
@@ -568,6 +581,19 @@
       "ktextwidgets",
       "kwidgetsaddons"
     ],
+    "chessament": [
+      "extra-cmake-modules",
+      "kconfig",
+      "kcoreaddons",
+      "ki18n",
+      "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
+      "qcoro",
+      "qqc2-desktop-style",
+      "qtkeychain"
+    ],
     "codevis": [
       "extra-cmake-modules",
       "kcmutils",
@@ -661,6 +687,7 @@
       "kbookmarks",
       "kcmutils",
       "kcodecs",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kcoreaddons",
@@ -699,20 +726,12 @@
     "dragon": [
       "extra-cmake-modules",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
-      "kdbusaddons",
       "kdoctools",
       "ki18n",
       "kio",
-      "kjobwidgets",
-      "kparts",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui",
-      "phonon",
-      "solid"
+      "kirigami"
     ],
     "drkonqi": [
       "extra-cmake-modules",
@@ -777,6 +796,7 @@
       "extra-cmake-modules",
       "kcalendarcore",
       "kcalutils",
+      "kcolorscheme",
       "kdiagram",
       "kmime",
       "libkdepim"
@@ -926,7 +946,6 @@
       "kwindowsystem",
       "kxmlgui",
       "libkdcraw",
-      "phonon",
       "plasma-activities",
       "purpose",
       "wayland",
@@ -1055,8 +1074,7 @@
       "kwallet",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "k3b": [
       "extra-cmake-modules",
@@ -1112,7 +1130,6 @@
       "kio",
       "kservice",
       "kwidgetsaddons",
-      "kwindowsystem",
       "kxmlgui"
     ],
     "kaddressbook": [
@@ -1121,6 +1138,7 @@
       "akonadi-search",
       "extra-cmake-modules",
       "grantleetheme",
+      "kcolorscheme",
       "kiconthemes",
       "kontactinterface",
       "kuserfeedback",
@@ -2262,6 +2280,7 @@
     ],
     "kgeotag": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
@@ -2476,6 +2495,7 @@
     ],
     "kile": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
       "kcrash",
@@ -2716,6 +2736,7 @@
     ],
     "kitinerary-workbench": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kio",
       "kitinerary",
       "ktexteditor"
@@ -2730,7 +2751,9 @@
       "extra-cmake-modules",
       "kcoreaddons",
       "kcrash",
-      "ki18n"
+      "ki18n",
+      "kirigami",
+      "kirigami-addons"
     ],
     "kjumpingcube": [
       "extra-cmake-modules",
@@ -3251,6 +3274,7 @@
       "kiconthemes",
       "kio",
       "kparts",
+      "ktexteditor",
       "kwindowsystem",
       "plasma-activities"
     ],
@@ -3447,6 +3471,7 @@
     ],
     "kphotoalbum": [
       "karchive",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kcoreaddons",
@@ -3524,6 +3549,8 @@
     "kpublictransport": [
       "extra-cmake-modules",
       "ki18n",
+      "kirigami-addons",
+      "kitemmodels",
       "networkmanager-qt"
     ],
     "kqtquickcharts": [
@@ -3675,6 +3702,7 @@
       "karchive",
       "kbookmarks",
       "kcodecs",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kcoreaddons",
@@ -3915,6 +3943,7 @@
       "kiconthemes",
       "knotifications",
       "knotifyconfig",
+      "kstatusnotifieritem",
       "ktextwidgets",
       "kxmlgui"
     ],
@@ -3940,6 +3969,7 @@
       "extra-cmake-modules",
       "karchive",
       "kauth",
+      "kcolorscheme",
       "kconfig",
       "kguiaddons",
       "ki18n",
@@ -3955,7 +3985,6 @@
     ],
     "ktextwidgets": [
       "extra-cmake-modules",
-      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "ki18n",
@@ -4105,7 +4134,8 @@
       "kcmutils",
       "kcoreaddons",
       "ki18n",
-      "kservice"
+      "kservice",
+      "solid"
     ],
     "kunitconversion": [
       "extra-cmake-modules",
@@ -4214,10 +4244,12 @@
       "extra-cmake-modules"
     ],
     "kwin": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
@@ -4249,6 +4281,7 @@
       "wayland-protocols"
     ],
     "kwin-x11": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
@@ -4268,7 +4301,6 @@
       "knewstuff",
       "knotifications",
       "kpackage",
-      "kpipewire",
       "kscreenlocker",
       "kservice",
       "ksvg",
@@ -4555,6 +4587,7 @@
     ],
     "lokalize": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
       "kcrash",
@@ -4586,6 +4619,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcodecs",
+      "kcolorscheme",
       "kmailtransport",
       "kmime",
       "libkdepim",
@@ -4710,6 +4744,9 @@
       "mauikit",
       "syntax-highlighting"
     ],
+    "mauiman": [
+      "extra-cmake-modules"
+    ],
     "mbox-importer": [
       "akonadi",
       "extra-cmake-modules",
@@ -4806,6 +4843,7 @@
       "kquickcharts",
       "kquickimageeditor",
       "kstatusnotifieritem",
+      "kunifiedpush",
       "kwindowsystem",
       "libquotient",
       "prison",
@@ -5027,6 +5065,7 @@
       "extra-cmake-modules",
       "kcalendarcore",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
       "kcontacts",
       "kcrash",
@@ -5137,7 +5176,6 @@
       "baloo",
       "breeze",
       "extra-cmake-modules",
-      "kaccounts-integration",
       "kactivitymanagerd",
       "kauth",
       "kcmutils",
@@ -5380,6 +5418,7 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -5493,6 +5532,7 @@
       "kbookmarks",
       "kcmutils",
       "kcodecs",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -5501,7 +5541,6 @@
       "kdbusaddons",
       "kdeclarative",
       "kded",
-      "kdesu",
       "kfilemetadata",
       "kglobalaccel",
       "kglobalacceld",
@@ -5607,6 +5646,7 @@
       "kcrash",
       "kdbusaddons",
       "ki18n",
+      "knotifications",
       "kwindowsystem",
       "polkit-qt-1"
     ],
@@ -5711,8 +5751,7 @@
       "kcoreaddons",
       "kguiaddons",
       "kiconthemes",
-      "kirigami",
-      "kquickcharts"
+      "kirigami"
     ],
     "qqc2-desktop-style": [
       "extra-cmake-modules",
@@ -5798,6 +5837,7 @@
     ],
     "rsibreak": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcoreaddons",
@@ -6097,6 +6137,7 @@
     "systemsettings": [
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
       "kcrash",
       "kdbusaddons",
@@ -6119,6 +6160,7 @@
     ],
     "tellico": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcrash",
@@ -6127,6 +6169,7 @@
       "ki18n",
       "kiconthemes",
       "kio",
+      "kio-extras",
       "kitemmodels",
       "knewstuff",
       "kwidgetsaddons",
@@ -6193,9 +6236,6 @@
       "kconfig",
       "kcoreaddons",
       "kcrash",
-      "kdev-php",
-      "kdevelop",
-      "kdevelop-pg-qt",
       "kdoctools",
       "ki18n",
       "kiconthemes",
@@ -6305,6 +6345,7 @@
     "yakuake": [
       "extra-cmake-modules",
       "karchive",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
       "kcrash",
@@ -6334,5 +6375,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "f0a9ee94"
+  "version": "53cdc203"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index ac93447a1295..9a19e2020a8f 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -186,6 +186,11 @@
     "LGPL-2.1-or-later",
     "LicenseRef-KDE-Accepted-GPL"
   ],
+  "aurorae": [
+    "CC0-1.0",
+    "GPL-2.0-or-later",
+    "MIT"
+  ],
   "baloo": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -385,6 +390,7 @@
     "GPL-2.0-only",
     "GPL-2.0-or-later",
     "GPL-3.0-only",
+    "LGPL-2.0-only",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
     "LGPL-3.0-or-later",
@@ -759,6 +765,7 @@
   ],
   "kcolorscheme": [
     "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -1203,7 +1210,10 @@
     "Bison-exception-2.2",
     "CC0-1.0",
     "GPL-3.0-or-later",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "ki18n": [
     "BSD-3-Clause",
@@ -1402,9 +1412,13 @@
     "ODbL-1.0"
   ],
   "kjobwidgets": [
+    "BSD-2-Clause",
     "CC0-1.0",
     "LGPL-2.0-only",
-    "LGPL-2.0-or-later"
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kjournald": [
     "BSD-3-Clause",
@@ -1840,6 +1854,7 @@
   ],
   "krunner": [
     "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -2044,10 +2059,12 @@
   "kwallet": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-3.0-only",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-or-later",
-    "LGPL-3.0-or-later"
+    "LGPL-3.0-or-later",
+    "LicenseRef-KDE-Accepted-GPL"
   ],
   "kwallet-pam": [
     "BSD-3-Clause",
@@ -2124,6 +2141,22 @@
     "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
+  "kwin-x11": [
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
+    "LGPL-2.0-only",
+    "LGPL-2.0-or-later",
+    "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
+  ],
   "kwindowsystem": [
     "CC0-1.0",
     "LGPL-2.0-or-later",
@@ -2260,7 +2293,6 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
-    "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -2628,7 +2660,6 @@
   ],
   "plasma-mobile": [
     "Apache-2.0",
-    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2645,10 +2676,10 @@
   "plasma-nano": [
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "LGPL-2.0-or-later",
-    "MIT"
+    "LGPL-2.0-or-later"
   ],
   "plasma-nm": [
+    "BSD-2-Clauses",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2702,6 +2733,7 @@
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "plasma-vault": [
+    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 9192503d8952..85743e9111dc 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -8,7 +8,7 @@
   "abakus": {
     "description": "Simple, keyboard-driven calculator",
     "name": "abakus",
-    "project_path": "playground/utils/abakus",
+    "project_path": "utils/abakus",
     "repo_path": "utilities/abakus"
   },
   "about-distro": {
@@ -20,7 +20,7 @@
   "accessibility-inspector": {
     "description": "Inspect your application accessibility tree",
     "name": "accessibility-inspector",
-    "project_path": "extragear/accessibility/accessibility-inspector",
+    "project_path": "accessibility/accessibility-inspector",
     "repo_path": "accessibility/accessibility-inspector"
   },
   "accounts-qt": {
@@ -56,37 +56,37 @@
   "akonadi": {
     "description": "Cross-desktop storage service for PIM data providing concurrent access",
     "name": "akonadi",
-    "project_path": "kde/pim/akonadi",
+    "project_path": "pim/akonadi",
     "repo_path": "pim/akonadi"
   },
   "akonadi-airsync": {
     "description": "Akonadi Resource to download emails from MS Exchange servers",
     "name": "akonadi-airsync",
-    "project_path": "playground/pim/akonadi-airsync",
+    "project_path": "pim/akonadi-airsync",
     "repo_path": "pim/akonadi-airsync"
   },
   "akonadi-calendar": {
     "description": "Akonadi calendar integration",
     "name": "akonadi-calendar",
-    "project_path": "kde/pim/akonadi-calendar",
+    "project_path": "pim/akonadi-calendar",
     "repo_path": "pim/akonadi-calendar"
   },
   "akonadi-calendar-tools": {
     "description": "Console applications and utilities for managing calendars in Akonadi",
     "name": "akonadi-calendar-tools",
-    "project_path": "kde/pim/akonadi-calendar-tools",
+    "project_path": "pim/akonadi-calendar-tools",
     "repo_path": "pim/akonadi-calendar-tools"
   },
   "akonadi-contacts": {
     "description": "Libraries and daemons to implement Contact Management in Akonadi",
     "name": "akonadi-contacts",
-    "project_path": "kde/pim/akonadi-contacts",
+    "project_path": "pim/akonadi-contacts",
     "repo_path": "pim/akonadi-contacts"
   },
   "akonadi-exchange": {
     "description": "Akonadi plugin for Exchange groupware functionality",
     "name": "akonadi-exchange",
-    "project_path": "playground/pim/akonadi-exchange",
+    "project_path": "pim/akonadi-exchange",
     "repo_path": "pim/akonadi-exchange"
   },
   "akonadi-facebook": {
@@ -116,31 +116,31 @@
   "akonadi-import-wizard": {
     "description": "Assistant to import external PIM data into Akonadi for use in KDE PIM apps",
     "name": "akonadi-import-wizard",
-    "project_path": "kde/pim/akonadi-import-wizard",
+    "project_path": "pim/akonadi-import-wizard",
     "repo_path": "pim/akonadi-import-wizard"
   },
   "akonadi-mime": {
     "description": "Helpers to make working with emails through Akonadi easier",
     "name": "akonadi-mime",
-    "project_path": "kde/pim/akonadi-mime",
+    "project_path": "pim/akonadi-mime",
     "repo_path": "pim/akonadi-mime"
   },
   "akonadi-notes": {
     "description": "Libraries and daemons to implement note management in Akonadi",
     "name": "akonadi-notes",
-    "project_path": "kde/pim/akonadi-notes",
+    "project_path": "pim/akonadi-notes",
     "repo_path": "pim/akonadi-notes"
   },
   "akonadi-phabricator-resource": {
     "description": "Synchronize your Phabricator tasks with KOrganizer",
     "name": "akonadi-phabricator-resource",
-    "project_path": "playground/pim/akonadi-phabricator-resource",
+    "project_path": "pim/akonadi-phabricator-resource",
     "repo_path": "pim/akonadi-phabricator-resource"
   },
   "akonadi-search": {
     "description": "Libraries and daemons to implement searching in Akonadi",
     "name": "akonadi-search",
-    "project_path": "kde/pim/akonadi-search",
+    "project_path": "pim/akonadi-search",
     "repo_path": "pim/akonadi-search"
   },
   "akonadi-sugarcrm": {
@@ -158,19 +158,19 @@
   "akonadiclient": {
     "description": "Command-line interface to Akonadi",
     "name": "akonadiclient",
-    "project_path": "playground/pim/akonadiclient",
+    "project_path": "pim/akonadiclient",
     "repo_path": "pim/akonadiclient"
   },
   "akonadiconsole": {
     "description": "Application for debugging Akonadi Resources",
     "name": "akonadiconsole",
-    "project_path": "kde/pim/akonadiconsole",
+    "project_path": "pim/akonadiconsole",
     "repo_path": "pim/akonadiconsole"
   },
   "akregator": {
     "description": "RSS Feed Reader",
     "name": "akregator",
-    "project_path": "kde/pim/akregator",
+    "project_path": "pim/akregator",
     "repo_path": "pim/akregator"
   },
   "akunambol": {
@@ -182,43 +182,43 @@
   "alkimia": {
     "description": "Library used by KDE finance applications",
     "name": "alkimia",
-    "project_path": "extragear/office/alkimia",
+    "project_path": "office/alkimia",
     "repo_path": "office/alkimia"
   },
   "alligator": {
     "description": "Kirigami-based RSS reader",
     "name": "alligator",
-    "project_path": "extragear/network/alligator",
+    "project_path": "network/alligator",
     "repo_path": "network/alligator"
   },
   "alpaka": {
     "description": "Kirigami client for Ollama",
     "name": "alpaka",
-    "project_path": "playground/utils/alpaka",
+    "project_path": "utils/alpaka",
     "repo_path": "utilities/alpaka"
   },
   "amarok": {
     "description": "Powerful music player that lets you rediscover your music",
     "name": "amarok",
-    "project_path": "extragear/multimedia/amarok",
+    "project_path": "multimedia/amarok",
     "repo_path": "multimedia/amarok"
   },
   "amarok-history": {
     "description": "Amarok history",
     "name": "amarok-history",
-    "project_path": "extragear/multimedia/amarok/amarok-history",
+    "project_path": "multimedia/amarok/amarok-history",
     "repo_path": "historical/amarok-history"
   },
   "amor": {
     "description": "Amusing Misuse of Resources animation that sits on top of the curent window.",
     "name": "amor",
-    "project_path": "playground/games/amor",
+    "project_path": "games/amor",
     "repo_path": "games/amor"
   },
   "analitza": {
     "description": "Library that lets you add mathematical features to your program",
     "name": "analitza",
-    "project_path": "kde/kdeedu/analitza",
+    "project_path": "kdeedu/analitza",
     "repo_path": "education/analitza"
   },
   "android-builder": {
@@ -266,19 +266,19 @@
   "angelfish": {
     "description": "Web browser for Plasma Mobile",
     "name": "angelfish",
-    "project_path": "extragear/base/angelfish",
+    "project_path": "base/angelfish",
     "repo_path": "network/angelfish"
   },
   "apper": {
     "description": "Package management application using PackageKit",
     "name": "apper",
-    "project_path": "extragear/sysadmin/apper",
+    "project_path": "sysadmin/apper",
     "repo_path": "system/apper"
   },
   "appimage-packaging": {
     "description": "Recipes and other materials needed to create application AppImages",
     "name": "appimage-packaging",
-    "project_path": "playground/packaging/appimage-packaging",
+    "project_path": "packaging/appimage-packaging",
     "repo_path": "packaging/appimage-packaging"
   },
   "appmenu-runner": {
@@ -302,37 +302,37 @@
   "arca": {
     "description": "Maui Archiver for compressed files",
     "name": "arca",
-    "project_path": "playground/base/arca",
+    "project_path": "base/arca",
     "repo_path": "maui/arca"
   },
   "arianna": {
     "description": "EPub Reader for mobile devices",
     "name": "arianna",
-    "project_path": "extragear/graphics/arianna",
+    "project_path": "graphics/arianna",
     "repo_path": "graphics/arianna"
   },
   "ark": {
     "description": "File archiver by KDE",
     "name": "ark",
-    "project_path": "kde/kdeutils/ark",
+    "project_path": "kdeutils/ark",
     "repo_path": "utilities/ark"
   },
   "arkade": {
     "description": "Collection of Arcade games developed in Kirigami",
     "name": "arkade",
-    "project_path": "playground/games/arkade",
+    "project_path": "games/arkade",
     "repo_path": "games/arkade"
   },
   "artikulate": {
     "description": "Pronunciation trainer to improve your skills by listening to native speakers",
     "name": "artikulate",
-    "project_path": "kde/kdeedu/artikulate",
+    "project_path": "kdeedu/artikulate",
     "repo_path": "education/artikulate"
   },
   "artikulate-data": {
     "description": "Artikulate course data files",
     "name": "artikulate-data",
-    "project_path": "playground/edu/artikulate-data",
+    "project_path": "edu/artikulate-data",
     "repo_path": "education/artikulate-data"
   },
   "assemblygen": {
@@ -344,31 +344,31 @@
   "asynqt": {
     "description": "Framework which provides convenience methods that make QFuture actually useful",
     "name": "asynqt",
-    "project_path": "playground/libs/asynqt",
+    "project_path": "libs/asynqt",
     "repo_path": "libraries/asynqt"
   },
   "atcore": {
     "description": "Library for connection and management of 3D printers (Atelier Core)",
     "name": "atcore",
-    "project_path": "extragear/base/atcore",
+    "project_path": "base/atcore",
     "repo_path": "libraries/atcore"
   },
   "atcore-cli": {
     "description": "Open Source 3D Printing Host - CLI Interface",
     "name": "atcore-cli",
-    "project_path": "playground/base/atcore-cli",
+    "project_path": "base/atcore-cli",
     "repo_path": "utilities/atcore-cli"
   },
   "atelier": {
     "description": "Desktop interface to control 3D printers powered by AtCore",
     "name": "atelier",
-    "project_path": "playground/base/atelier",
+    "project_path": "base/atelier",
     "repo_path": "utilities/atelier"
   },
   "atlantik": {
     "description": "Atlantik Game",
     "name": "atlantik",
-    "project_path": "playground/games/atlantik",
+    "project_path": "games/atlantik",
     "repo_path": "games/atlantik"
   },
   "attica": {
@@ -380,31 +380,31 @@
   "audex": {
     "description": "Tool for ripping compact discs",
     "name": "audex",
-    "project_path": "playground/multimedia/audex",
+    "project_path": "multimedia/audex",
     "repo_path": "multimedia/audex"
   },
   "audiocd-kio": {
     "description": "KIO worker for accessing audio CDs",
     "name": "audiocd-kio",
-    "project_path": "kde/kdemultimedia/audiocd-kio",
+    "project_path": "kdemultimedia/audiocd-kio",
     "repo_path": "multimedia/audiocd-kio"
   },
   "audiotube": {
     "description": "Client for YouTube Music",
     "name": "audiotube",
-    "project_path": "extragear/multimedia/audiotube",
+    "project_path": "multimedia/audiotube",
     "repo_path": "multimedia/audiotube"
   },
   "aura-browser": {
     "description": "Browser for a fully immersed Big Screen experience allowing you to navigate the world wide web using just your remote control",
     "name": "aura-browser",
-    "project_path": "kde/workspace/aura-browser",
+    "project_path": "workspace/aura-browser",
     "repo_path": "plasma/aura-browser"
   },
   "aurorae": {
     "description": "Aurorae is a themeable window decoration for KWin",
     "name": "aurorae",
-    "project_path": "playground/base/aurorae",
+    "project_path": "base/aurorae",
     "repo_path": "plasma/aurorae"
   },
   "automoc": {
@@ -428,55 +428,55 @@
   "baloo-widgets": {
     "description": "Widgets for Baloo",
     "name": "baloo-widgets",
-    "project_path": "kde/applications/baloo-widgets",
+    "project_path": "applications/baloo-widgets",
     "repo_path": "libraries/baloo-widgets"
   },
   "bangarang": {
-    "description": "",
+    "description": "Bangarang application",
     "name": "bangarang",
-    "project_path": "playground/multimedia/bangarang",
+    "project_path": "multimedia/bangarang",
     "repo_path": "unmaintained/bangarang"
   },
   "basket": {
     "description": "Notes and to-dos organizer",
     "name": "basket",
-    "project_path": "playground/utils/basket",
+    "project_path": "utils/basket",
     "repo_path": "utilities/basket"
   },
   "bigscreen-application-launcher-skill": {
     "description": "Voice application launcher skill for Plasma Bigscreen",
     "name": "bigscreen-application-launcher-skill",
-    "project_path": "playground/utils/bigscreen-application-launcher-skill",
+    "project_path": "utils/bigscreen-application-launcher-skill",
     "repo_path": "plasma-bigscreen/bigscreen-application-launcher-skill"
   },
   "bigscreen-debos-image-rpi4": {
     "description": "Recipes and other materials needed to build a Plasma Bigscreen image for Raspberry Pi4 devices, using DebOS",
     "name": "bigscreen-debos-image-rpi4",
-    "project_path": "playground/utils/bigscreen-debos-image-rpi4",
+    "project_path": "utils/bigscreen-debos-image-rpi4",
     "repo_path": "plasma-bigscreen/bigscreen-debos-image-rpi4"
   },
   "bigscreen-image-settings": {
     "description": "Recipes and other materials needed to build Plasma Bigscreen images",
     "name": "bigscreen-image-settings",
-    "project_path": "playground/utils/bigscreen-image-settings",
+    "project_path": "utils/bigscreen-image-settings",
     "repo_path": "plasma-bigscreen/bigscreen-image-settings"
   },
   "bigscreen-platform-skill": {
     "description": "Platform control skill for Plasma Bigscreen, providing Window Management Features for Voice Applications on Bigscreen Platform",
     "name": "bigscreen-platform-skill",
-    "project_path": "playground/utils/bigscreen-platform-skill",
+    "project_path": "utils/bigscreen-platform-skill",
     "repo_path": "plasma-bigscreen/bigscreen-platform-skill"
   },
   "binschema": {
     "description": "Code generator that produces code to read Microsoft Office files",
     "name": "binschema",
-    "project_path": "playground/libs/binschema",
+    "project_path": "libs/binschema",
     "repo_path": "libraries/binschema"
   },
   "blinken": {
     "description": "Memory Enhancement Game",
     "name": "blinken",
-    "project_path": "kde/kdeedu/blinken",
+    "project_path": "kdeedu/blinken",
     "repo_path": "education/blinken"
   },
   "blogilo": {
@@ -488,7 +488,7 @@
   "bluedevil": {
     "description": "Bluedevil adds Bluetooth capabilities to KDE Plasma",
     "name": "bluedevil",
-    "project_path": "kde/workspace/bluedevil",
+    "project_path": "workspace/bluedevil",
     "repo_path": "plasma/bluedevil"
   },
   "bluez-qt": {
@@ -524,13 +524,13 @@
   "bomber": {
     "description": "Bomber is a single player arcade game",
     "name": "bomber",
-    "project_path": "kde/kdegames/bomber",
+    "project_path": "kdegames/bomber",
     "repo_path": "games/bomber"
   },
   "bonsai": {
     "description": "Mobile Git repository manager",
     "name": "bonsai",
-    "project_path": "playground/base/bonsai",
+    "project_path": "base/bonsai",
     "repo_path": "maui/bonsai"
   },
   "bookmanager": {
@@ -542,25 +542,25 @@
   "bovo": {
     "description": "Bovo is a Gomoku like game for two players",
     "name": "bovo",
-    "project_path": "kde/kdegames/bovo",
+    "project_path": "kdegames/bovo",
     "repo_path": "games/bovo"
   },
   "breeze": {
     "description": "Artwork, styles and assets for the Breeze visual style for the Plasma Desktop",
     "name": "breeze",
-    "project_path": "kde/workspace/breeze",
+    "project_path": "workspace/breeze",
     "repo_path": "plasma/breeze"
   },
   "breeze-grub": {
     "description": "GRUB theme for the Breeze visual style for the Plasma Desktop",
     "name": "breeze-grub",
-    "project_path": "kde/workspace/breeze-grub",
+    "project_path": "workspace/breeze-grub",
     "repo_path": "plasma/breeze-grub"
   },
   "breeze-gtk": {
     "description": "Breeze widget theme for GTK 2 and 3",
     "name": "breeze-gtk",
-    "project_path": "kde/workspace/breeze-gtk",
+    "project_path": "workspace/breeze-gtk",
     "repo_path": "plasma/breeze-gtk"
   },
   "breeze-icons": {
@@ -572,19 +572,19 @@
   "breeze-plymouth": {
     "description": "Plymouth theme for the Breeze visual style for the Plasma Desktop",
     "name": "breeze-plymouth",
-    "project_path": "kde/workspace/breeze-plymouth",
+    "project_path": "workspace/breeze-plymouth",
     "repo_path": "plasma/breeze-plymouth"
   },
   "brio": {
     "description": "Application for creating animations in Inkscape",
     "name": "brio",
-    "project_path": "playground/graphics/brio",
+    "project_path": "graphics/brio",
     "repo_path": "graphics/brio"
   },
   "brooklyn": {
     "description": "Protocol independent software which forwards messages between various chat services.",
     "name": "brooklyn",
-    "project_path": "playground/utils/brooklyn",
+    "project_path": "utils/brooklyn",
     "repo_path": "unmaintained/brooklyn"
   },
   "brprint3d": {
@@ -596,13 +596,13 @@
   "brun": {
     "description": "Maui Calculator app",
     "name": "brun",
-    "project_path": "playground/base/brun",
+    "project_path": "base/brun",
     "repo_path": "maui/brun"
   },
   "buho": {
     "description": "Task and Note Keeper",
     "name": "buho",
-    "project_path": "playground/base/buho",
+    "project_path": "base/buho",
     "repo_path": "maui/buho"
   },
   "cagibi": {
@@ -614,19 +614,19 @@
   "calamares-bigscreen-branding": {
     "description": "Plasma Bigscreen branding and customization for Calamares",
     "name": "calamares-bigscreen-branding",
-    "project_path": "playground/utils/calamares-bigscreen-branding",
+    "project_path": "utils/calamares-bigscreen-branding",
     "repo_path": "plasma-bigscreen/calamares-bigscreen-branding"
   },
   "calendarsupport": {
     "description": "Library that provides calendar support for PIM",
     "name": "calendarsupport",
-    "project_path": "kde/pim/calendarsupport",
+    "project_path": "pim/calendarsupport",
     "repo_path": "pim/calendarsupport"
   },
   "calindori": {
     "description": "Calendar for Plasma Mobile",
     "name": "calindori",
-    "project_path": "extragear/pim/calindori",
+    "project_path": "pim/calindori",
     "repo_path": "plasma-mobile/calindori"
   },
   "calligra": {
@@ -650,29 +650,35 @@
   "cantor": {
     "description": "Front end to powerful mathematics and statistics packages",
     "name": "cantor",
-    "project_path": "kde/kdeedu/cantor",
+    "project_path": "kdeedu/cantor",
     "repo_path": "education/cantor"
   },
   "cervisia": {
     "description": "GUI for CVS",
     "name": "cervisia",
-    "project_path": "kde/kdesdk/cervisia",
+    "project_path": "kdesdk/cervisia",
     "repo_path": "sdk/cervisia"
   },
+  "chessament": {
+    "description": "Chess tournament manager",
+    "name": "chessament",
+    "project_path": "games/chessament",
+    "repo_path": "games/chessament"
+  },
   "chocolatey-packaging": {
     "description": "Packaging information necessary to generate Chocolatey.org packages",
     "name": "chocolatey-packaging",
-    "project_path": "playground/devtools/chocolatey-packaging",
+    "project_path": "devtools/chocolatey-packaging",
     "repo_path": "packaging/chocolatey-packaging"
   },
   "choqok": {
     "description": "Microblogging client by KDE",
     "name": "choqok",
-    "project_path": "extragear/network/choqok",
+    "project_path": "network/choqok",
     "repo_path": "network/choqok"
   },
   "cirkuit": {
-    "description": "KDE interface for LaTeX graphic tools (such as TikZ, Gnuplot, Circuit Macros) to produce publication-ready pictures.\n\nPlease use \"bugs.kde.org\":https://bugs.kde.org/wizard.cgi?package=cirkuit&kbugreport=1 to file bug reports and wishes.",
+    "description": "KDE interface for LaTeX graphic tools (such as TikZ, Gnuplot, Circuit Macros) to produce publication-ready pictures",
     "name": "cirkuit",
     "project_path": "unmaintained/cirkuit",
     "repo_path": "unmaintained/cirkuit"
@@ -680,7 +686,7 @@
   "clazy": {
     "description": "Qt-oriented static code analyzer based on the Clang framework",
     "name": "clazy",
-    "project_path": "extragear/sdk/clazy",
+    "project_path": "sdk/clazy",
     "repo_path": "sdk/clazy"
   },
   "cmark": {
@@ -692,19 +698,19 @@
   "cmetronome": {
     "description": "Command line metronome",
     "name": "cmetronome",
-    "project_path": "playground/utils/cmetronome",
+    "project_path": "utils/cmetronome",
     "repo_path": "unmaintained/cmetronome"
   },
   "cocoon": {
     "description": "A GUI for Git.",
     "name": "cocoon",
-    "project_path": "playground/sdk/cocoon",
+    "project_path": "sdk/cocoon",
     "repo_path": "unmaintained/cocoon"
   },
   "codevis": {
     "description": "Codevis is an analysis and visualization tool designed to assist in code maintenance for C++ codebases.",
     "name": "codevis",
-    "project_path": "playground/sdk/codevis",
+    "project_path": "sdk/codevis",
     "repo_path": "sdk/codevis"
   },
   "colibri": {
@@ -716,13 +722,13 @@
   "colord-kde": {
     "description": "Provides interfaces and session daemon to colord",
     "name": "colord-kde",
-    "project_path": "playground/graphics/colord-kde",
+    "project_path": "graphics/colord-kde",
     "repo_path": "graphics/colord-kde"
   },
   "confine": {
     "description": "Replacement to the KIOSK tool",
     "name": "confine",
-    "project_path": "playground/utils/confine",
+    "project_path": "utils/confine",
     "repo_path": "utilities/confine"
   },
   "conquirere": {
@@ -764,19 +770,19 @@
   "croutons": {
     "description": "Library for asynchronous Qt, including QML-friendly futures and C++20 coroutine integration",
     "name": "croutons",
-    "project_path": "extragear/libs/croutons",
+    "project_path": "libs/croutons",
     "repo_path": "libraries/croutons"
   },
   "crow-translate": {
     "description": "Application that allows you to translate and speak text",
     "name": "crow-translate",
-    "project_path": "kde/office/crow-translate",
+    "project_path": "office/crow-translate",
     "repo_path": "office/crow-translate"
   },
   "cutehmi": {
     "description": "Open-source HMI (Human Machine Interface) software written in C++ and QML",
     "name": "cutehmi",
-    "project_path": "playground/base/cutehmi",
+    "project_path": "base/cutehmi",
     "repo_path": "sdk/cutehmi"
   },
   "cutepaste": {
@@ -788,19 +794,19 @@
   "cxx-kde-frameworks": {
     "description": "Extension Crate for cxx-qt which allows the use of KDE Frameworks in Rust software",
     "name": "cxx-kde-frameworks",
-    "project_path": "playground/libs/cxx-kde-frameworks",
+    "project_path": "libs/cxx-kde-frameworks",
     "repo_path": "libraries/cxx-kde-frameworks"
   },
   "cxx11-cmake-modules": {
     "description": "CMake modules for detecting C++11 features supported by the compiler",
     "name": "cxx11-cmake-modules",
-    "project_path": "playground/base/cxx11-cmake-modules",
+    "project_path": "base/cxx11-cmake-modules",
     "repo_path": "libraries/cxx11-cmake-modules"
   },
   "daykountdown": {
     "description": "A simple date countdown app written for KDE Plasma, using Kirigami.",
     "name": "daykountdown",
-    "project_path": "playground/utilities/daykountdown",
+    "project_path": "utilities/daykountdown",
     "repo_path": "utilities/daykountdown"
   },
   "declarative-plasmoids": {
@@ -818,19 +824,19 @@
   "dferry": {
     "description": "D-Bus library and tools",
     "name": "dferry",
-    "project_path": "playground/sdk/dferry",
+    "project_path": "sdk/dferry",
     "repo_path": "sdk/dferry"
   },
   "digikam": {
     "description": "digiKam is an advanced open-source digital photo management application that runs on Linux, Windows, and MacOS. The application provides a comprehensive set of tools for importing, managing, editing, and sharing photos and raw files.",
     "name": "digikam",
-    "project_path": "extragear/graphics/digikam",
+    "project_path": "graphics/digikam",
     "repo_path": "graphics/digikam"
   },
   "digikam-doc": {
     "description": "Documentation for the digiKam photo management application",
     "name": "digikam-doc",
-    "project_path": "extragear/graphics/digikam/digikam-doc",
+    "project_path": "graphics/digikam/digikam-doc",
     "repo_path": "documentation/digikam-doc"
   },
   "digikam-software-compilation": {
@@ -842,25 +848,25 @@
   "digikam-test-data": {
     "description": "Data required to support running unit tests for digiKam",
     "name": "digikam-test-data",
-    "project_path": "extragear/graphics/digikam-test-data",
+    "project_path": "graphics/digikam-test-data",
     "repo_path": "graphics/digikam-test-data"
   },
   "discover": {
     "description": "Helps you find and install applications, games, and tools",
     "name": "discover",
-    "project_path": "kde/workspace/discover",
+    "project_path": "workspace/discover",
     "repo_path": "plasma/discover"
   },
   "distro-release-notifier": {
-    "description": "",
+    "description": "Distribution release notifier",
     "name": "distro-release-notifier",
-    "project_path": "playground/base/distro-release-notifier",
+    "project_path": "base/distro-release-notifier",
     "repo_path": "system/distro-release-notifier"
   },
   "docker-neon-all": {
     "description": "Docker packaging environment for KDE Neon, including everything",
     "name": "docker-neon-all",
-    "project_path": "playground/packaging/docker-neon-all",
+    "project_path": "packaging/docker-neon-all",
     "repo_path": "packaging/docker-neon-all"
   },
   "documentation-develop-kde-org": {
@@ -876,7 +882,7 @@
     "repo_path": "documentation/docs-kdenlive-org"
   },
   "documentation-docs-krita-org": {
-    "description": "The Krita Manual. Built with Sphinx by Jenkins, available online at https://docs.krita.org\r\n\r\nCheck the krita_manual_readme.rst on how to help us!",
+    "description": "The Krita Manual available online at https://docs.krita.org",
     "name": "documentation-docs-krita-org",
     "project_path": "documentation/docs-krita-org",
     "repo_path": "documentation/docs-krita-org"
@@ -914,37 +920,37 @@
   "dolphin": {
     "description": "File manager by KDE",
     "name": "dolphin",
-    "project_path": "kde/applications/dolphin",
+    "project_path": "applications/dolphin",
     "repo_path": "system/dolphin"
   },
   "dolphin-plugins": {
     "description": "Plugins for Dolphin",
     "name": "dolphin-plugins",
-    "project_path": "kde/kdesdk/dolphin-plugins",
+    "project_path": "kdesdk/dolphin-plugins",
     "repo_path": "sdk/dolphin-plugins"
   },
   "doxyqml": {
     "description": "Doxygen filter to allow generation of API Documentation for QML",
     "name": "doxyqml",
-    "project_path": "playground/sdk/doxyqml",
+    "project_path": "sdk/doxyqml",
     "repo_path": "sdk/doxyqml"
   },
   "dragon": {
     "description": "Multimedia player with the focus on simplicity, not features",
     "name": "dragon",
-    "project_path": "kde/kdemultimedia/dragon",
+    "project_path": "kdemultimedia/dragon",
     "repo_path": "multimedia/dragon"
   },
   "drkonqi": {
     "description": "Crash handler for KDE software",
     "name": "drkonqi",
-    "project_path": "kde/workspace/drkonqi",
+    "project_path": "workspace/drkonqi",
     "repo_path": "plasma/drkonqi"
   },
   "drkonqi-pk-debug-installer": {
     "description": "PackageKit based debug package installer (for debian-like distros) for DrKonqi",
     "name": "drkonqi-pk-debug-installer",
-    "project_path": "playground/base/drkonqi-pk-debug-installer",
+    "project_path": "base/drkonqi-pk-debug-installer",
     "repo_path": "system/drkonqi-pk-debug-installer"
   },
   "dummy": {
@@ -962,19 +968,19 @@
   "elf-dissector": {
     "description": "Tools for inspecting, analyzing and optimizing ELF files",
     "name": "elf-dissector",
-    "project_path": "extragear/sdk/elf-dissector",
+    "project_path": "sdk/elf-dissector",
     "repo_path": "sdk/elf-dissector"
   },
   "elisa": {
     "description": "Simple music player aiming to provide a nice experience for its users",
     "name": "elisa",
-    "project_path": "kde/kdemultimedia/elisa",
+    "project_path": "kdemultimedia/elisa",
     "repo_path": "multimedia/elisa"
   },
   "eloquens": {
     "description": "Generate the lorem ipsum text",
     "name": "eloquens",
-    "project_path": "kdereview/eloquens",
+    "project_path": "eloquens",
     "repo_path": "sdk/eloquens"
   },
   "emerge": {
@@ -992,7 +998,7 @@
   "eventviews": {
     "description": "Library for displaying and creating events and calendars",
     "name": "eventviews",
-    "project_path": "kde/pim/eventviews",
+    "project_path": "pim/eventviews",
     "repo_path": "pim/eventviews"
   },
   "extra-cmake-modules": {
@@ -1010,43 +1016,43 @@
   "falkon": {
     "description": "Cross-platform Qt-based web browser",
     "name": "falkon",
-    "project_path": "extragear/network/falkon",
+    "project_path": "network/falkon",
     "repo_path": "network/falkon"
   },
   "ffmpegthumbs": {
     "description": "FFmpeg-based thumbnail creator for video files",
     "name": "ffmpegthumbs",
-    "project_path": "kde/kdemultimedia/ffmpegthumbs",
+    "project_path": "kdemultimedia/ffmpegthumbs",
     "repo_path": "multimedia/ffmpegthumbs"
   },
   "fielding": {
     "description": "A simple REST API testing tool",
     "name": "fielding",
-    "project_path": "playground/utils/fielding",
+    "project_path": "utils/fielding",
     "repo_path": "utilities/fielding"
   },
   "filelight": {
     "description": "Quickly visualize your disk space usage",
     "name": "filelight",
-    "project_path": "kde/kdeutils/filelight",
+    "project_path": "kdeutils/filelight",
     "repo_path": "utilities/filelight"
   },
   "flatpak-kcm": {
     "description": "Flatpak Permissions Management KCM",
     "name": "flatpak-kcm",
-    "project_path": "kde/workspace/flatpak-kcm",
+    "project_path": "workspace/flatpak-kcm",
     "repo_path": "plasma/flatpak-kcm"
   },
   "flatpak-kde-applications": {
     "description": "Flatpak packaging files for some KDE Applications",
     "name": "flatpak-kde-applications",
-    "project_path": "playground/packaging/flatpak-kde-applications",
+    "project_path": "packaging/flatpak-kde-applications",
     "repo_path": "packaging/flatpak-kde-applications"
   },
   "flatpak-kde-runtime": {
     "description": "Files to generate a repository with org.kde.Platform and Sdk",
     "name": "flatpak-kde-runtime",
-    "project_path": "playground/packaging/flatpak-kde-runtime",
+    "project_path": "packaging/flatpak-kde-runtime",
     "repo_path": "packaging/flatpak-kde-runtime"
   },
   "flickr-runner": {
@@ -1058,7 +1064,7 @@
   "foss-public-alert-server": {
     "description": "Open source server that allows desktop applications to receive near real-time push notifications about emergency alerts worldwide.",
     "name": "foss-public-alert-server",
-    "project_path": "playground/www/foss-public-alert-server",
+    "project_path": "www/foss-public-alert-server",
     "repo_path": "webapps/foss-public-alert-server"
   },
   "frameworkintegration": {
@@ -1070,7 +1076,7 @@
   "francis": {
     "description": "Track your time",
     "name": "francis",
-    "project_path": "extragear/utils/francis",
+    "project_path": "utils/francis",
     "repo_path": "utilities/francis"
   },
   "futuresql": {
@@ -1082,19 +1088,19 @@
   "gcompris": {
     "description": "High-quality educational software suite for children aged 2 to 10",
     "name": "gcompris",
-    "project_path": "extragear/edu/gcompris",
+    "project_path": "edu/gcompris",
     "repo_path": "education/gcompris"
   },
   "gcompris-data": {
     "description": "Data files for GCompris",
     "name": "gcompris-data",
-    "project_path": "extragear/edu/gcompris-data",
+    "project_path": "edu/gcompris-data",
     "repo_path": "education/gcompris-data"
   },
   "geonames-data": {
     "description": "Cache of geo name exports from geonames.org",
     "name": "geonames-data",
-    "project_path": "playground/packaging/geonames-data",
+    "project_path": "packaging/geonames-data",
     "repo_path": "packaging/geonames-data"
   },
   "gestures-kde": {
@@ -1106,19 +1112,19 @@
   "ghostwriter": {
     "description": "Text editor for Markdown",
     "name": "ghostwriter",
-    "project_path": "kde/office/ghostwriter",
+    "project_path": "office/ghostwriter",
     "repo_path": "office/ghostwriter"
   },
   "ginkgo": {
     "description": "Ginkgo is a generic resource navigator and editor for Nepomuk, the KDE semantic toolkit.",
     "name": "ginkgo",
-    "project_path": "playground/utils/ginkgo",
+    "project_path": "utils/ginkgo",
     "repo_path": "unmaintained/ginkgo"
   },
   "git-lab": {
     "description": "Command-line client for GitLab",
     "name": "git-lab",
-    "project_path": "playground/sdk/git-lab",
+    "project_path": "sdk/git-lab",
     "repo_path": "sdk/git-lab"
   },
   "glaxnimate": {
@@ -1154,49 +1160,49 @@
   "granatier": {
     "description": "Granatier is a clone of the classic Bomberman game",
     "name": "granatier",
-    "project_path": "kde/kdegames/granatier",
+    "project_path": "kdegames/granatier",
     "repo_path": "games/granatier"
   },
   "grantlee-editor": {
     "description": "Utilities and tools to manage themes in KDE PIM applications",
     "name": "grantlee-editor",
-    "project_path": "kde/pim/grantlee-editor",
+    "project_path": "pim/grantlee-editor",
     "repo_path": "pim/grantlee-editor"
   },
   "grantleetheme": {
     "description": "Library that provides Grantlee theme support",
     "name": "grantleetheme",
-    "project_path": "kde/pim/grantleetheme",
+    "project_path": "pim/grantleetheme",
     "repo_path": "pim/grantleetheme"
   },
   "gwenview": {
     "description": "Image viewer by KDE",
     "name": "gwenview",
-    "project_path": "kde/kdegraphics/gwenview",
+    "project_path": "kdegraphics/gwenview",
     "repo_path": "graphics/gwenview"
   },
   "haruna": {
     "description": "Open source video player built with Qt/QML and libmpv.",
     "name": "haruna",
-    "project_path": "kde/kdemultimedia/haruna",
+    "project_path": "kdemultimedia/haruna",
     "repo_path": "multimedia/haruna"
   },
   "hash-o-matic": {
     "description": "Simple hash validator allowing to compare two files, generate the checksum of a file and verify if a hash matches a file.",
     "name": "hash-o-matic",
-    "project_path": "extragear/utils/hash-o-matic",
+    "project_path": "utils/hash-o-matic",
     "repo_path": "utilities/hash-o-matic"
   },
   "heaptrack": {
     "description": "A heap memory profiler for Linux",
     "name": "heaptrack",
-    "project_path": "extragear/sdk/heaptrack",
+    "project_path": "sdk/heaptrack",
     "repo_path": "sdk/heaptrack"
   },
   "homebrew-kde": {
     "description": "Homebrew formulas for building KDE software on macOS",
     "name": "homebrew-kde",
-    "project_path": "playground/devtools/homebrew-kde",
+    "project_path": "devtools/homebrew-kde",
     "repo_path": "packaging/homebrew-kde"
   },
   "homerun": {
@@ -1208,37 +1214,37 @@
   "ikona": {
     "description": "Icon editing companion",
     "name": "ikona",
-    "project_path": "extragear/sdk/ikona",
+    "project_path": "sdk/ikona",
     "repo_path": "sdk/ikona"
   },
   "incidenceeditor": {
     "description": "Library that provides calendar incidence editor",
     "name": "incidenceeditor",
-    "project_path": "kde/pim/incidenceeditor",
+    "project_path": "pim/incidenceeditor",
     "repo_path": "pim/incidenceeditor"
   },
   "index-fm": {
     "description": "Multi-platform file manager",
     "name": "index-fm",
-    "project_path": "playground/base/index-fm",
+    "project_path": "base/index-fm",
     "repo_path": "maui/index-fm"
   },
   "inqlude-client": {
     "description": "Command-line client for inqlude.org",
     "name": "inqlude-client",
-    "project_path": "playground/sdk/inqlude-client",
+    "project_path": "sdk/inqlude-client",
     "repo_path": "sdk/inqlude-client"
   },
   "isoimagewriter": {
     "description": "Program to write hybrid ISO files onto USB disks",
     "name": "isoimagewriter",
-    "project_path": "extragear/utils/isoimagewriter",
+    "project_path": "utils/isoimagewriter",
     "repo_path": "utilities/isoimagewriter"
   },
   "itinerary": {
     "description": "Itinerary and boarding pass management application",
     "name": "itinerary",
-    "project_path": "kde/pim/itinerary",
+    "project_path": "pim/itinerary",
     "repo_path": "pim/itinerary"
   },
   "jovie": {
@@ -1256,19 +1262,19 @@
   "juk": {
     "description": "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files",
     "name": "juk",
-    "project_path": "kde/kdemultimedia/juk",
+    "project_path": "kdemultimedia/juk",
     "repo_path": "multimedia/juk"
   },
   "jungle": {
     "description": "Jungle is an absolutely awesome video player for managing your videos (movies, tvshows, etc)",
     "name": "jungle",
-    "project_path": "playground/multimedia/jungle",
+    "project_path": "multimedia/jungle",
     "repo_path": "unmaintained/jungle"
   },
   "k3b": {
     "description": "Full-featured CD/DVD/Blu-ray burning and ripping application",
     "name": "k3b",
-    "project_path": "kde/kdemultimedia/k3b",
+    "project_path": "kdemultimedia/k3b",
     "repo_path": "multimedia/k3b"
   },
   "kaccessible": {
@@ -1280,121 +1286,127 @@
   "kaccounts-integration": {
     "description": "Online account management system and its Plasma integration components",
     "name": "kaccounts-integration",
-    "project_path": "kde/kdenetwork/kaccounts-integration",
+    "project_path": "kdenetwork/kaccounts-integration",
     "repo_path": "network/kaccounts-integration"
   },
   "kaccounts-mobile": {
     "description": "Collection of things for KAccounts targeted for Plasma Mobile",
     "name": "kaccounts-mobile",
-    "project_path": "playground/mobile/kaccounts-mobile",
+    "project_path": "mobile/kaccounts-mobile",
     "repo_path": "plasma-mobile/kaccounts-mobile"
   },
   "kaccounts-providers": {
     "description": "Online account providers for the KAccounts system",
     "name": "kaccounts-providers",
-    "project_path": "kde/kdenetwork/kaccounts-providers",
+    "project_path": "kdenetwork/kaccounts-providers",
     "repo_path": "network/kaccounts-providers"
   },
   "kactivitymanagerd": {
     "description": "System service to manage user's activities, track the usage patterns etc.",
     "name": "kactivitymanagerd",
-    "project_path": "kde/workspace/kactivitymanagerd",
+    "project_path": "workspace/kactivitymanagerd",
     "repo_path": "plasma/kactivitymanagerd"
   },
   "kaddressbook": {
     "description": "Address book application to manage your contacts",
     "name": "kaddressbook",
-    "project_path": "kde/pim/kaddressbook",
+    "project_path": "pim/kaddressbook",
     "repo_path": "pim/kaddressbook"
   },
   "kaffeine": {
     "description": "Media player with support for digital television (DVB-C/S/S2/T, ATSC, CI/CAM)",
     "name": "kaffeine",
-    "project_path": "extragear/multimedia/kaffeine",
+    "project_path": "multimedia/kaffeine",
     "repo_path": "multimedia/kaffeine"
   },
+  "kaichat": {
+    "description": "Chat interface for AI models such as ollama",
+    "name": "kaichat",
+    "project_path": "utilities/kaichat",
+    "repo_path": "utilities/kaichat"
+  },
   "kaidan": {
     "description": "Modern chat app for every device",
     "name": "kaidan",
-    "project_path": "kdereview/kaidan",
+    "project_path": "kaidan",
     "repo_path": "network/kaidan"
   },
   "kairo": {
     "description": "Programmable timer",
     "name": "kairo",
-    "project_path": "playground/utils/kairo",
+    "project_path": "utils/kairo",
     "repo_path": "utilities/kairo"
   },
   "kajongg": {
     "description": "Mah Jongg - the ancient Chinese board game for 4 players",
     "name": "kajongg",
-    "project_path": "kde/kdegames/kajongg",
+    "project_path": "kdegames/kajongg",
     "repo_path": "games/kajongg"
   },
   "kalarm": {
     "description": "Application to manage alarms and other timer-based alerts on the desktop",
     "name": "kalarm",
-    "project_path": "kde/pim/kalarm",
+    "project_path": "pim/kalarm",
     "repo_path": "pim/kalarm"
   },
   "kalarmcal": {
     "description": "Calendar support for KAlarm",
     "name": "kalarmcal",
-    "project_path": "kde/pim/kalarmcal",
+    "project_path": "pim/kalarmcal",
     "repo_path": "pim/kalarmcal"
   },
   "kalgebra": {
     "description": "2D and 3D Graph Calculator",
     "name": "kalgebra",
-    "project_path": "kde/kdeedu/kalgebra",
+    "project_path": "kdeedu/kalgebra",
     "repo_path": "education/kalgebra"
   },
   "kalk": {
     "description": "Kalk is a powerful cross-platform calculator application built with the [Kirigami framework](https://kde.org/products/kirigami/)",
     "name": "kalk",
-    "project_path": "extragear/utils/kalk",
+    "project_path": "utils/kalk",
     "repo_path": "utilities/kalk"
   },
   "kalm": {
     "description": "Kalm can teach you different breathing techniques.",
     "name": "kalm",
-    "project_path": "kdereview/kalm",
+    "project_path": "kalm",
     "repo_path": "utilities/kalm"
   },
   "kalternatives": {
     "description": "Distribution alternatives configuration",
     "name": "kalternatives",
-    "project_path": "playground/sysadmin/kalternatives",
+    "project_path": "sysadmin/kalternatives",
     "repo_path": "system/kalternatives"
   },
   "kalzium": {
     "description": "Periodic Table of Elements",
     "name": "kalzium",
-    "project_path": "kde/kdeedu/kalzium",
+    "project_path": "kdeedu/kalzium",
     "repo_path": "education/kalzium"
   },
   "kamera": {
     "description": "KDE integration for gphoto2 cameras",
     "name": "kamera",
-    "project_path": "kde/kdegraphics/kamera",
+    "project_path": "kdegraphics/kamera",
     "repo_path": "graphics/kamera"
   },
   "kamoso": {
     "description": "Application to take pictures and videos with your webcam",
     "name": "kamoso",
-    "project_path": "kde/kdemultimedia/kamoso",
+    "project_path": "kdemultimedia/kamoso",
     "repo_path": "multimedia/kamoso"
   },
   "kanagram": {
     "description": "Letter Order Game",
     "name": "kanagram",
-    "project_path": "kde/kdeedu/kanagram",
+    "project_path": "kdeedu/kanagram",
     "repo_path": "education/kanagram"
   },
   "kanalytics": {
     "description": "KAnalytics provides a library and a set of tools to analyze system information and upload it to KDE servers.",
     "name": "kanalytics",
-    "project_path": "playground/utils/kanalytics",
+    "project_path": "utils/kanalytics",
     "repo_path": "unmaintained/kanalytics"
   },
   "kannasaver": {
@@ -1418,13 +1430,13 @@
   "kapman": {
     "description": "Kapman is a clone of the well known game Pac-Man",
     "name": "kapman",
-    "project_path": "kde/kdegames/kapman",
+    "project_path": "kdegames/kapman",
     "repo_path": "games/kapman"
   },
   "kapptemplate": {
     "description": "Factory for the easy creation of KDE/Qt components and programs",
     "name": "kapptemplate",
-    "project_path": "kde/kdesdk/kapptemplate",
+    "project_path": "kdesdk/kapptemplate",
     "repo_path": "sdk/kapptemplate"
   },
   "karchive": {
@@ -1436,43 +1448,43 @@
   "kard": {
     "description": "Memory-like game for kids",
     "name": "kard",
-    "project_path": "playground/edu/kard",
+    "project_path": "edu/kard",
     "repo_path": "education/kard"
   },
   "karp": {
     "description": "Simple PDF editor to arrange, merge and improve PDF file(s)",
     "name": "karp",
-    "project_path": "playground/graphics/karp",
+    "project_path": "graphics/karp",
     "repo_path": "graphics/karp"
   },
   "kartesio": {
     "description": "Calculate best fit curves with experimental points using regression or neural networks",
     "name": "kartesio",
-    "project_path": "playground/edu/kartesio",
+    "project_path": "edu/kartesio",
     "repo_path": "education/kartesio"
   },
   "kasts": {
     "description": "Kirigami-based podcast player",
     "name": "kasts",
-    "project_path": "extragear/multimedia/kasts",
+    "project_path": "multimedia/kasts",
     "repo_path": "multimedia/kasts"
   },
   "kasync": {
     "description": "C++ library for controlling asynchronous tasks",
     "name": "kasync",
-    "project_path": "playground/libs/kasync",
+    "project_path": "libs/kasync",
     "repo_path": "libraries/kasync"
   },
   "kate": {
     "description": "Advanced text editor",
     "name": "kate",
-    "project_path": "kde/applications/kate",
+    "project_path": "applications/kate",
     "repo_path": "utilities/kate"
   },
   "katomic": {
     "description": "Katomic is a fun and educational game built around molecular geometry",
     "name": "katomic",
-    "project_path": "kde/kdegames/katomic",
+    "project_path": "kdegames/katomic",
     "repo_path": "games/katomic"
   },
   "kaudiocreator": {
@@ -1490,37 +1502,37 @@
   "kbackup": {
     "description": "Backup program with an easy-to-use interface",
     "name": "kbackup",
-    "project_path": "kde/kdeutils/kbackup",
+    "project_path": "kdeutils/kbackup",
     "repo_path": "utilities/kbackup"
   },
   "kbibtex": {
     "description": "An editor for bibliographies used with LaTeX",
     "name": "kbibtex",
-    "project_path": "extragear/office/kbibtex",
+    "project_path": "office/kbibtex",
     "repo_path": "office/kbibtex"
   },
   "kbibtex-testset": {
     "description": "Testing data for KBibTex",
     "name": "kbibtex-testset",
-    "project_path": "extragear/office/kbibtex-testset",
+    "project_path": "office/kbibtex-testset",
     "repo_path": "office/kbibtex-testset"
   },
   "kblackbox": {
     "description": "KBlackBox is a game of hide and seek played on a grid of boxes",
     "name": "kblackbox",
-    "project_path": "kde/kdegames/kblackbox",
+    "project_path": "kdegames/kblackbox",
     "repo_path": "games/kblackbox"
   },
   "kblocks": {
     "description": "KBlocks is the classic falling blocks game",
     "name": "kblocks",
-    "project_path": "kde/kdegames/kblocks",
+    "project_path": "kdegames/kblocks",
     "repo_path": "games/kblocks"
   },
   "kblog": {
     "description": "Support for reading various blog feeds",
     "name": "kblog",
-    "project_path": "kde/pim/kblog",
+    "project_path": "pim/kblog",
     "repo_path": "pim/kblog"
   },
   "kbookmarks": {
@@ -1532,31 +1544,31 @@
   "kbounce": {
     "description": "KBounce is a single player arcade game with the elements of puzzle",
     "name": "kbounce",
-    "project_path": "kde/kdegames/kbounce",
+    "project_path": "kdegames/kbounce",
     "repo_path": "games/kbounce"
   },
   "kbreakout": {
     "description": "KBreakOut is a Breakout-like game. Its objective is to destroy as many bricks as possible without losing the ball.",
     "name": "kbreakout",
-    "project_path": "kde/kdegames/kbreakout",
+    "project_path": "kdegames/kbreakout",
     "repo_path": "games/kbreakout"
   },
   "kbruch": {
     "description": "Practice Fractions",
     "name": "kbruch",
-    "project_path": "kde/kdeedu/kbruch",
+    "project_path": "kdeedu/kbruch",
     "repo_path": "education/kbruch"
   },
   "kcachegrind": {
     "description": "GUI to profilers such as Valgrind",
     "name": "kcachegrind",
-    "project_path": "kde/kdesdk/kcachegrind",
+    "project_path": "kdesdk/kcachegrind",
     "repo_path": "sdk/kcachegrind"
   },
   "kcalc": {
     "description": "Calculator offering everything a scientific calculator does, and more",
     "name": "kcalc",
-    "project_path": "kde/kdeutils/kcalc",
+    "project_path": "kdeutils/kcalc",
     "repo_path": "utilities/kcalc"
   },
   "kcalendarcore": {
@@ -1568,43 +1580,43 @@
   "kcalutils": {
     "description": "Library to assist working with calendars",
     "name": "kcalutils",
-    "project_path": "kde/pim/kcalutils",
+    "project_path": "pim/kcalutils",
     "repo_path": "pim/kcalutils"
   },
   "kcgroups": {
     "description": "Library for easy access to running apps and their control groups resources",
     "name": "kcgroups",
-    "project_path": "kdereview/kcgroups",
+    "project_path": "kcgroups",
     "repo_path": "libraries/kcgroups"
   },
   "kcharselect": {
     "description": "Tool to select and copy special characters from all installed fonts",
     "name": "kcharselect",
-    "project_path": "kde/kdeutils/kcharselect",
+    "project_path": "kdeutils/kcharselect",
     "repo_path": "utilities/kcharselect"
   },
   "kclock": {
     "description": "Clock app for Plasma Mobile",
     "name": "kclock",
-    "project_path": "extragear/utils/kclock",
+    "project_path": "utils/kclock",
     "repo_path": "utilities/kclock"
   },
   "kcm-grub2": {
     "description": "KDE Control Module for configuring the GRUB bootloader",
     "name": "kcm-grub2",
-    "project_path": "extragear/sysadmin/kcm-grub2",
+    "project_path": "sysadmin/kcm-grub2",
     "repo_path": "system/kcm-grub2"
   },
   "kcm-userconfig": {
     "description": "A System Settings module for managing users and groups on your system.",
     "name": "kcm-userconfig",
-    "project_path": "playground/sysadmin/kcm-userconfig",
+    "project_path": "sysadmin/kcm-userconfig",
     "repo_path": "unmaintained/kcm-userconfig"
   },
   "kcmgrub2": {
     "description": "Kcm module that manages the most common settings of grub2",
     "name": "kcmgrub2",
-    "project_path": "playground/sysadmin/kcmgrub2",
+    "project_path": "sysadmin/kcmgrub2",
     "repo_path": "unmaintained/kcmgrub2"
   },
   "kcmutils": {
@@ -1622,7 +1634,7 @@
   "kcolorchooser": {
     "description": "A small utility to select a color",
     "name": "kcolorchooser",
-    "project_path": "kde/kdegraphics/kcolorchooser",
+    "project_path": "kdegraphics/kcolorchooser",
     "repo_path": "graphics/kcolorchooser"
   },
   "kcoloredit": {
@@ -1676,7 +1688,7 @@
   "kcron": {
     "description": "Task scheduler by KDE",
     "name": "kcron",
-    "project_path": "kde/kdeadmin/kcron",
+    "project_path": "kdeadmin/kcron",
     "repo_path": "system/kcron"
   },
   "kcwsh": {
@@ -1694,13 +1706,13 @@
   "kdav2": {
     "description": "DAV protocol implementation with KJobs",
     "name": "kdav2",
-    "project_path": "playground/pim/kdav2",
+    "project_path": "pim/kdav2",
     "repo_path": "pim/kdav2"
   },
   "kdb": {
     "description": "Database connectivity and creation framework for various database vendors",
     "name": "kdb",
-    "project_path": "extragear/libs/kdb",
+    "project_path": "libs/kdb",
     "repo_path": "libraries/kdb"
   },
   "kdbusaddons": {
@@ -1736,53 +1748,53 @@
   "kde-builder": {
     "description": "A tool to streamline the process of setting up and maintaining a development environment for KDE software.",
     "name": "kde-builder",
-    "project_path": "playground/sdk/kde-builder",
+    "project_path": "sdk/kde-builder",
     "repo_path": "sdk/kde-builder"
   },
   "kde-cli-tools": {
     "description": "Tools based on KDE Frameworks 5 to better interact with the system",
     "name": "kde-cli-tools",
-    "project_path": "kde/workspace/kde-cli-tools",
+    "project_path": "workspace/kde-cli-tools",
     "repo_path": "plasma/kde-cli-tools"
   },
   "kde-dev-scripts": {
     "description": "Scripts and setting files useful during development of KDE software",
     "name": "kde-dev-scripts",
-    "project_path": "kde/kdesdk/kde-dev-scripts",
+    "project_path": "kdesdk/kde-dev-scripts",
     "repo_path": "sdk/kde-dev-scripts"
   },
   "kde-dev-utils": {
     "description": "Small utilities for developers using KDE/Qt libs/frameworks",
     "name": "kde-dev-utils",
-    "project_path": "kde/kdesdk/kde-dev-utils",
+    "project_path": "kdesdk/kde-dev-utils",
     "repo_path": "sdk/kde-dev-utils"
   },
   "kde-gtk-config": {
     "description": "Syncs KDE settings to GTK applications",
     "name": "kde-gtk-config",
-    "project_path": "kde/workspace/kde-gtk-config",
+    "project_path": "workspace/kde-gtk-config",
     "repo_path": "plasma/kde-gtk-config"
   },
   "kde-gui-test": {
     "description": "Tool for emulating user behaviour for energy consumption measurements",
     "name": "kde-gui-test",
-    "project_path": "playground/sdk/kde-gui-test",
+    "project_path": "sdk/kde-gui-test",
     "repo_path": "sdk/kde-gui-test"
   },
   "kde-inotify-survey": {
     "description": "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached.",
     "name": "kde-inotify-survey",
-    "project_path": "extragear/system/kde-inotify-survey",
+    "project_path": "system/kde-inotify-survey",
     "repo_path": "system/kde-inotify-survey"
   },
   "kde-linux": {
-    "description": "",
+    "description": "KDE Linux project",
     "name": "kde-linux",
     "project_path": "kde-linux/kde-linux",
     "repo_path": "kde-linux/kde-linux"
   },
   "kde-linux-packages": {
-    "description": "",
+    "description": "Packages for KDE Linux",
     "name": "kde-linux-packages",
     "project_path": "kde-linux/kde-linux-packages",
     "repo_path": "kde-linux/kde-linux-packages"
@@ -1790,7 +1802,7 @@
   "kde-nomodeset": {
     "description": "Safe Graphics Mode Startup Utility",
     "name": "kde-nomodeset",
-    "project_path": "playground/base/kde-nomodeset",
+    "project_path": "base/kde-nomodeset",
     "repo_path": "system/kde-nomodeset"
   },
   "kde-now": {
@@ -1805,10 +1817,16 @@
     "project_path": "others/kde-promo",
     "repo_path": "unmaintained/kde-promo"
   },
+  "kde-qdoc-common": {
+    "description": "Common files for KDE's API documentation (using QDoc)",
+    "name": "kde-qdoc-common",
+    "project_path": "sdk/kde-qdoc-common",
+    "repo_path": "sdk/kde-qdoc-common"
+  },
   "kde-ruleset": {
     "description": "svn2git rules files and support scripts for KDE's SVN-to-Git migration",
     "name": "kde-ruleset",
-    "project_path": "playground/sdk/kde-ruleset",
+    "project_path": "sdk/kde-ruleset",
     "repo_path": "sdk/kde-ruleset"
   },
   "kde-runtime": {
@@ -1820,13 +1838,13 @@
   "kde-vdg-extras": {
     "description": "Colour schemes, avatars and other additional visual assets for KDE Software created by the KDE VDG",
     "name": "kde-vdg-extras",
-    "project_path": "playground/artwork/kde-vdg-extras",
+    "project_path": "artwork/kde-vdg-extras",
     "repo_path": "plasma/kde-vdg-extras"
   },
   "kde-workspace": {
     "description": "Provides the interface and basic tools for the KDE workspace.",
     "name": "kde-workspace",
-    "project_path": "kde/kde-workspace",
+    "project_path": "kde-workspace",
     "repo_path": "unmaintained/kde-workspace"
   },
   "kde1": {
@@ -1910,7 +1928,7 @@
   "kdebugsettings": {
     "description": "Application to choose which QLoggingCategory are displayed",
     "name": "kdebugsettings",
-    "project_path": "kde/kdeutils/kdebugsettings",
+    "project_path": "kdeutils/kdebugsettings",
     "repo_path": "utilities/kdebugsettings"
   },
   "kdeclarative": {
@@ -1922,37 +1940,37 @@
   "kdeconnect-android": {
     "description": "Native Android port of the KDE Connect Qt app",
     "name": "kdeconnect-android",
-    "project_path": "extragear/network/kdeconnect-android",
+    "project_path": "network/kdeconnect-android",
     "repo_path": "network/kdeconnect-android"
   },
   "kdeconnect-ios": {
     "description": "Native iOS port of KDE Connect",
     "name": "kdeconnect-ios",
-    "project_path": "playground/network/kdeconnect-ios",
+    "project_path": "network/kdeconnect-ios",
     "repo_path": "network/kdeconnect-ios"
   },
   "kdeconnect-kde": {
     "description": "Multi-platform app that allows your devices to communicate",
     "name": "kdeconnect-kde",
-    "project_path": "kde/kdenetwork/kdeconnect-kde",
+    "project_path": "kdenetwork/kdeconnect-kde",
     "repo_path": "network/kdeconnect-kde"
   },
   "kdeconnect-meta": {
     "description": "Coordination for multi-platform applications that allows your devices to communicate",
     "name": "kdeconnect-meta",
-    "project_path": "kde/kdenetwork/kdeconnect-meta",
+    "project_path": "kdenetwork/kdeconnect-meta",
     "repo_path": "network/kdeconnect-meta"
   },
   "kdecoration": {
     "description": "Plugin-based library to create window decorations",
     "name": "kdecoration",
-    "project_path": "kde/workspace/kdecoration",
+    "project_path": "workspace/kdecoration",
     "repo_path": "plasma/kdecoration"
   },
   "kdecoration-viewer": {
     "description": "Application that allows to preview a KDecoration plugin",
     "name": "kdecoration-viewer",
-    "project_path": "playground/base/kdecoration-viewer",
+    "project_path": "base/kdecoration-viewer",
     "repo_path": "sdk/kdecoration-viewer"
   },
   "kded": {
@@ -1964,7 +1982,7 @@
   "kdeedu-data": {
     "description": "Shared icons, artwork and data files for educational applications",
     "name": "kdeedu-data",
-    "project_path": "kde/kdeedu/kdeedu-data",
+    "project_path": "kdeedu/kdeedu-data",
     "repo_path": "education/kdeedu-data"
   },
   "kdeexamples": {
@@ -1982,7 +2000,7 @@
   "kdegraphics-mobipocket": {
     "description": "A collection of plugins to handle mobipocket files",
     "name": "kdegraphics-mobipocket",
-    "project_path": "kde/kdegraphics/kdegraphics-mobipocket",
+    "project_path": "kdegraphics/kdegraphics-mobipocket",
     "repo_path": "graphics/kdegraphics-mobipocket"
   },
   "kdegraphics-strigi-analyzer": {
@@ -1994,7 +2012,7 @@
   "kdegraphics-thumbnailers": {
     "description": "Thumbnailers for various graphics file formats",
     "name": "kdegraphics-thumbnailers",
-    "project_path": "kde/kdegraphics/kdegraphics-thumbnailers",
+    "project_path": "kdegraphics/kdegraphics-thumbnailers",
     "repo_path": "graphics/kdegraphics-thumbnailers"
   },
   "kdelibs": {
@@ -2012,7 +2030,7 @@
   "kdenetwork-filesharing": {
     "description": "Samba file sharing plugin for file properties",
     "name": "kdenetwork-filesharing",
-    "project_path": "kde/kdenetwork/kdenetwork-filesharing",
+    "project_path": "kdenetwork/kdenetwork-filesharing",
     "repo_path": "network/kdenetwork-filesharing"
   },
   "kdenetwork-strigi-analyzers": {
@@ -2024,19 +2042,19 @@
   "kdenlive": {
     "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks",
     "name": "kdenlive",
-    "project_path": "kde/kdemultimedia/kdenlive",
+    "project_path": "kdemultimedia/kdenlive",
     "repo_path": "multimedia/kdenlive"
   },
   "kdenlive-opentimelineio": {
     "description": "OpenTimelineIO Adapter for Kdenlive",
     "name": "kdenlive-opentimelineio",
-    "project_path": "playground/multimedia/kdenlive-opentimelineio",
+    "project_path": "multimedia/kdenlive-opentimelineio",
     "repo_path": "multimedia/kdenlive-opentimelineio"
   },
   "kdenlive-test-suite": {
     "description": "Tooling, samples and other materials needed for testing Kdenlive functionality",
     "name": "kdenlive-test-suite",
-    "project_path": "playground/multimedia/kdenlive-test-suite",
+    "project_path": "multimedia/kdenlive-test-suite",
     "repo_path": "multimedia/kdenlive-test-suite"
   },
   "kdepim": {
@@ -2048,25 +2066,25 @@
   "kdepim-addons": {
     "description": "Add-ons for KDE PIM apps (KMail, KAddressBook etc.)",
     "name": "kdepim-addons",
-    "project_path": "kde/pim/kdepim-addons",
+    "project_path": "pim/kdepim-addons",
     "repo_path": "pim/kdepim-addons"
   },
   "kdepim-apps-libs": {
     "description": "This module contains mail-related libraries",
     "name": "kdepim-apps-libs",
-    "project_path": "kde/pim/kdepim-apps-libs",
+    "project_path": "pim/kdepim-apps-libs",
     "repo_path": "pim/kdepim-apps-libs"
   },
   "kdepim-docker": {
     "description": "Docker image for easy KDE PIM development",
     "name": "kdepim-docker",
-    "project_path": "playground/pim/kdepim-docker",
+    "project_path": "pim/kdepim-docker",
     "repo_path": "pim/kdepim-docker"
   },
   "kdepim-runtime": {
     "description": "Akonadi agents and resources",
     "name": "kdepim-runtime",
-    "project_path": "kde/pim/kdepim-runtime",
+    "project_path": "pim/kdepim-runtime",
     "repo_path": "pim/kdepim-runtime"
   },
   "kdepimlibs": {
@@ -2078,19 +2096,19 @@
   "kdeplasma-addons": {
     "description": "All kind of add-ons to improve your Plasma experience",
     "name": "kdeplasma-addons",
-    "project_path": "kde/workspace/kdeplasma-addons",
+    "project_path": "workspace/kdeplasma-addons",
     "repo_path": "plasma/kdeplasma-addons"
   },
   "kdesdk-devenv-dependencies": {
     "description": "Describes modules useful for development of KDE applications and Plasma",
     "name": "kdesdk-devenv-dependencies",
-    "project_path": "playground/packaging/kdesdk-devenv-dependencies",
+    "project_path": "packaging/kdesdk-devenv-dependencies",
     "repo_path": "packaging/kdesdk-devenv-dependencies"
   },
   "kdesdk-kio": {
     "description": "KIO workers useful for software development",
     "name": "kdesdk-kio",
-    "project_path": "kde/kdesdk/kdesdk-kio",
+    "project_path": "kdesdk/kdesdk-kio",
     "repo_path": "sdk/kdesdk-kio"
   },
   "kdesdk-strigi-analyzers": {
@@ -2102,7 +2120,7 @@
   "kdesdk-thumbnailers": {
     "description": "Plugins for the thumbnailing system",
     "name": "kdesdk-thumbnailers",
-    "project_path": "kde/kdesdk/kdesdk-thumbnailers",
+    "project_path": "kdesdk/kdesdk-thumbnailers",
     "repo_path": "sdk/kdesdk-thumbnailers"
   },
   "kdesignerplugin": {
@@ -2114,7 +2132,7 @@
   "kdesrc-build": {
     "description": "Script to streamline setting up and maintaining KDE software development environment",
     "name": "kdesrc-build",
-    "project_path": "extragear/utils/kdesrc-build",
+    "project_path": "utils/kdesrc-build",
     "repo_path": "sdk/kdesrc-build"
   },
   "kdesu": {
@@ -2132,7 +2150,7 @@
   "kdesvn": {
     "description": "Subversion client by KDE",
     "name": "kdesvn",
-    "project_path": "extragear/sdk/kdesvn",
+    "project_path": "sdk/kdesvn",
     "repo_path": "sdk/kdesvn"
   },
   "kdev-cargo": {
@@ -2156,7 +2174,7 @@
   "kdev-control-flow-graph": {
     "description": "KDevelop plugin that visualizes data from static code analysis in graphs",
     "name": "kdev-control-flow-graph",
-    "project_path": "playground/devtools/plugins/kdev-control-flow-graph",
+    "project_path": "devtools/plugins/kdev-control-flow-graph",
     "repo_path": "kdevelop/kdev-control-flow-graph"
   },
   "kdev-cppcheck": {
@@ -2174,19 +2192,19 @@
   "kdev-css": {
     "description": "KDevelop plugin for CSS language support",
     "name": "kdev-css",
-    "project_path": "playground/devtools/plugins/kdev-css",
+    "project_path": "devtools/plugins/kdev-css",
     "repo_path": "kdevelop/kdev-css"
   },
   "kdev-embedded": {
     "description": "Plugin for KDevelop to support the development of embedded systems",
     "name": "kdev-embedded",
-    "project_path": "playground/devtools/plugins/kdev-embedded",
+    "project_path": "devtools/plugins/kdev-embedded",
     "repo_path": "kdevelop/kdev-embedded"
   },
   "kdev-executebrowser": {
     "description": "KDevelop plugin that starts a script in a web browser",
     "name": "kdev-executebrowser",
-    "project_path": "playground/devtools/plugins/kdev-executebrowser",
+    "project_path": "devtools/plugins/kdev-executebrowser",
     "repo_path": "kdevelop/kdev-executebrowser"
   },
   "kdev-go": {
@@ -2204,13 +2222,13 @@
   "kdev-krazy2": {
     "description": "A plugin for KDevelop to perform Krazy2 analysis",
     "name": "kdev-krazy2",
-    "project_path": "playground/devtools/plugins/kdev-krazy2",
+    "project_path": "devtools/plugins/kdev-krazy2",
     "repo_path": "kdevelop/kdev-krazy2"
   },
   "kdev-mercurial": {
     "description": "Mercurial support plugin for KDevelop",
     "name": "kdev-mercurial",
-    "project_path": "playground/devtools/plugins/kdev-mercurial",
+    "project_path": "devtools/plugins/kdev-mercurial",
     "repo_path": "kdevelop/kdev-mercurial"
   },
   "kdev-perforce": {
@@ -2222,7 +2240,7 @@
   "kdev-php": {
     "description": "PHP Language Plugin for KDevelop",
     "name": "kdev-php",
-    "project_path": "extragear/kdevelop/plugins/kdev-php",
+    "project_path": "kdevelop/plugins/kdev-php",
     "repo_path": "kdevelop/kdev-php"
   },
   "kdev-php-docs": {
@@ -2240,7 +2258,7 @@
   "kdev-python": {
     "description": "KDevelop Python language support",
     "name": "kdev-python",
-    "project_path": "extragear/kdevelop/plugins/kdev-python",
+    "project_path": "kdevelop/plugins/kdev-python",
     "repo_path": "kdevelop/kdev-python"
   },
   "kdev-qmake": {
@@ -2258,7 +2276,7 @@
   "kdev-ruby": {
     "description": "KDevelop plugin which provides Ruby language support",
     "name": "kdev-ruby",
-    "project_path": "playground/devtools/plugins/kdev-ruby",
+    "project_path": "devtools/plugins/kdev-ruby",
     "repo_path": "kdevelop/kdev-ruby"
   },
   "kdev-rust": {
@@ -2276,19 +2294,19 @@
   "kdev-upload": {
     "description": "KDevelop plugin for uploading files to a remote server",
     "name": "kdev-upload",
-    "project_path": "playground/devtools/plugins/kdev-upload",
+    "project_path": "devtools/plugins/kdev-upload",
     "repo_path": "kdevelop/kdev-upload"
   },
   "kdev-valgrind": {
     "description": "Plugin offering a full integration of the Valgrind suite into KDevelop",
     "name": "kdev-valgrind",
-    "project_path": "playground/devtools/plugins/kdev-valgrind",
+    "project_path": "devtools/plugins/kdev-valgrind",
     "repo_path": "kdevelop/kdev-valgrind"
   },
   "kdev-verapp": {
     "description": "Verapp support plugin for KDevelop",
     "name": "kdev-verapp",
-    "project_path": "playground/devtools/plugins/kdev-verapp",
+    "project_path": "devtools/plugins/kdev-verapp",
     "repo_path": "kdevelop/kdev-verapp"
   },
   "kdev-www": {
@@ -2300,7 +2318,7 @@
   "kdev-xdebug": {
     "description": "KDevelop debugger plugin for PHP using XDebug",
     "name": "kdev-xdebug",
-    "project_path": "playground/devtools/plugins/kdev-xdebug",
+    "project_path": "devtools/plugins/kdev-xdebug",
     "repo_path": "kdevelop/kdev-xdebug"
   },
   "kdev-xml": {
@@ -2318,13 +2336,13 @@
   "kdevelop": {
     "description": "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP",
     "name": "kdevelop",
-    "project_path": "extragear/kdevelop/kdevelop",
+    "project_path": "kdevelop/kdevelop",
     "repo_path": "kdevelop/kdevelop"
   },
   "kdevelop-pg-qt": {
     "description": "KDevelop Parser Generator, used in the PHP language plugin and others",
     "name": "kdevelop-pg-qt",
-    "project_path": "extragear/kdevelop/utilities/kdevelop-pg-qt",
+    "project_path": "kdevelop/utilities/kdevelop-pg-qt",
     "repo_path": "kdevelop/kdevelop-pg-qt"
   },
   "kdevplatform": {
@@ -2360,7 +2378,7 @@
   "kdf": {
     "description": "Displays available storage devices and information about their usage",
     "name": "kdf",
-    "project_path": "kde/kdeutils/kdf",
+    "project_path": "kdeutils/kdf",
     "repo_path": "utilities/kdf"
   },
   "kdgantt2": {
@@ -2372,31 +2390,31 @@
   "kdiagram": {
     "description": "Powerful libraries (KChart, KGantt) for creating business diagrams",
     "name": "kdiagram",
-    "project_path": "extragear/graphics/kdiagram",
+    "project_path": "graphics/kdiagram",
     "repo_path": "graphics/kdiagram"
   },
   "kdialog": {
     "description": "Tool to show nice dialog boxes from shell scripts",
     "name": "kdialog",
-    "project_path": "kde/applications/kdialog",
+    "project_path": "applications/kdialog",
     "repo_path": "utilities/kdialog"
   },
   "kdiamond": {
     "description": "KDiamond is a single player puzzle game",
     "name": "kdiamond",
-    "project_path": "kde/kdegames/kdiamond",
+    "project_path": "kdegames/kdiamond",
     "repo_path": "games/kdiamond"
   },
   "kdiff3": {
     "description": "Utility for comparing and merging files and directories",
     "name": "kdiff3",
-    "project_path": "extragear/utils/kdiff3",
+    "project_path": "utils/kdiff3",
     "repo_path": "sdk/kdiff3"
   },
   "kdisksutilities": {
     "description": "Disks management utilities",
     "name": "kdisksutilities",
-    "project_path": "playground/sysadmin/kdisksutilities",
+    "project_path": "sysadmin/kdisksutilities",
     "repo_path": "system/kdisksutilities"
   },
   "kdnssd": {
@@ -2414,11 +2432,11 @@
   "kdocumentstore": {
     "description": "Library to store QVariants and QVariantMaps",
     "name": "kdocumentstore",
-    "project_path": "playground/libs/kdocumentstore",
+    "project_path": "libs/kdocumentstore",
     "repo_path": "libraries/kdocumentstore"
   },
   "kdots": {
-    "description": "KDots is the simple implementation of the game of dots written with Qt Toolkit and KDELibs.\n\nThe purpose of Dots game is to catch your opponent's dots by placing your dots on the game board where the lines cross.",
+    "description": "Game to catch your opponent's dots by placing your dots on the game board where the lines cross",
     "name": "kdots",
     "project_path": "unmaintained/kdots",
     "repo_path": "unmaintained/kdots"
@@ -2432,19 +2450,19 @@
   "kdsoap-ws-discovery-client": {
     "description": "Library for finding WS-Discovery devices in the network using Qt5 and KDSoap.",
     "name": "kdsoap-ws-discovery-client",
-    "project_path": "playground/libs/kdsoap-ws-discovery-client",
+    "project_path": "libs/kdsoap-ws-discovery-client",
     "repo_path": "libraries/kdsoap-ws-discovery-client"
   },
   "kecolab": {
     "description": "Measuring Energy Usage Remotely with Online Portal",
     "name": "kecolab",
-    "project_path": "playground/sdk/kecolab",
+    "project_path": "sdk/kecolab",
     "repo_path": "sdk/kecolab"
   },
   "keditbookmarks": {
     "description": "Bookmarks editor",
     "name": "keditbookmarks",
-    "project_path": "kde/applications/keditbookmarks",
+    "project_path": "applications/keditbookmarks",
     "repo_path": "utilities/keditbookmarks"
   },
   "kemoticons": {
@@ -2456,7 +2474,7 @@
   "keurocalc": {
     "description": "Utility to handle currency conversions between European currencies",
     "name": "keurocalc",
-    "project_path": "extragear/utils/keurocalc",
+    "project_path": "utils/keurocalc",
     "repo_path": "utilities/keurocalc"
   },
   "kexi": {
@@ -2468,7 +2486,7 @@
   "keysmith": {
     "description": "OTP client for Plasma Mobile and Desktop",
     "name": "keysmith",
-    "project_path": "extragear/utils/keysmith",
+    "project_path": "utils/keysmith",
     "repo_path": "utilities/keysmith"
   },
   "kf5book": {
@@ -2492,23 +2510,23 @@
   "kfind": {
     "description": "File search utility by KDE",
     "name": "kfind",
-    "project_path": "kde/applications/kfind",
+    "project_path": "applications/kfind",
     "repo_path": "utilities/kfind"
   },
   "kfloppy": {
     "description": "Graphical utility to format 3.5\" and 5.25\" floppy disks",
     "name": "kfloppy",
-    "project_path": "kde/kdeutils/kfloppy",
+    "project_path": "kdeutils/kfloppy",
     "repo_path": "utilities/kfloppy"
   },
   "kfourinline": {
     "description": "KFourInLine is a four-in-a-row game",
     "name": "kfourinline",
-    "project_path": "kde/kdegames/kfourinline",
+    "project_path": "kdegames/kfourinline",
     "repo_path": "games/kfourinline"
   },
   "kfritz": {
-    "description": "A KDE call monitor and frontend for users of AVMs Fritz!Box routers.\n\nYou can download source-tarballs from github, see below.",
+    "description": "A KDE call monitor and frontend for users of AVMs Fritz!Box routers",
     "name": "kfritz",
     "project_path": "unmaintained/kfritz",
     "repo_path": "unmaintained/kfritz"
@@ -2516,25 +2534,25 @@
   "kgamma": {
     "description": "Adjust your monitor's gamma settings",
     "name": "kgamma",
-    "project_path": "kde/workspace/kgamma",
+    "project_path": "workspace/kgamma",
     "repo_path": "plasma/kgamma"
   },
   "kgeography": {
     "description": "Geography Trainer",
     "name": "kgeography",
-    "project_path": "kde/kdeedu/kgeography",
+    "project_path": "kdeedu/kgeography",
     "repo_path": "education/kgeography"
   },
   "kgeotag": {
     "description": "Photo geotagging program",
     "name": "kgeotag",
-    "project_path": "extragear/graphics/kgeotag",
+    "project_path": "graphics/kgeotag",
     "repo_path": "graphics/kgeotag"
   },
   "kget": {
     "description": "Download Manager",
     "name": "kget",
-    "project_path": "kde/kdenetwork/kget",
+    "project_path": "kdenetwork/kget",
     "repo_path": "network/kget"
   },
   "kglobalaccel": {
@@ -2546,25 +2564,25 @@
   "kglobalacceld": {
     "description": "Daemon providing Global Keyboard Shortcut (Accelerator) functionality",
     "name": "kglobalacceld",
-    "project_path": "playground/base/kglobalacceld",
+    "project_path": "base/kglobalacceld",
     "repo_path": "plasma/kglobalacceld"
   },
   "kgoldrunner": {
     "description": "KGoldrunner is a game of action and puzzle solving",
     "name": "kgoldrunner",
-    "project_path": "kde/kdegames/kgoldrunner",
+    "project_path": "kdegames/kgoldrunner",
     "repo_path": "games/kgoldrunner"
   },
   "kgpg": {
     "description": "Simple interface for GnuPG, a powerful encryption utility",
     "name": "kgpg",
-    "project_path": "kde/kdeutils/kgpg",
+    "project_path": "kdeutils/kgpg",
     "repo_path": "utilities/kgpg"
   },
   "kgraphviewer": {
     "description": "GraphViz dot graph viewer",
     "name": "kgraphviewer",
-    "project_path": "extragear/graphics/kgraphviewer",
+    "project_path": "graphics/kgraphviewer",
     "repo_path": "graphics/kgraphviewer"
   },
   "kguiaddons": {
@@ -2576,25 +2594,25 @@
   "khangman": {
     "description": "A hangman game",
     "name": "khangman",
-    "project_path": "kde/kdeedu/khangman",
+    "project_path": "kdeedu/khangman",
     "repo_path": "education/khangman"
   },
   "khealthcertificate": {
     "description": "Handling of digital vaccination, test and recovery certificates.",
     "name": "khealthcertificate",
-    "project_path": "extragear/pim/khealthcertificate",
+    "project_path": "pim/khealthcertificate",
     "repo_path": "pim/khealthcertificate"
   },
   "khelpcenter": {
     "description": "Software documentation viewer",
     "name": "khelpcenter",
-    "project_path": "kde/applications/khelpcenter",
+    "project_path": "applications/khelpcenter",
     "repo_path": "system/khelpcenter"
   },
   "khipu": {
     "description": "Advanced mathematical function plotter",
     "name": "khipu",
-    "project_path": "playground/edu/khipu",
+    "project_path": "edu/khipu",
     "repo_path": "education/khipu"
   },
   "kholidays": {
@@ -2606,7 +2624,7 @@
   "khotkeys": {
     "description": "Trigger actions when certain keys are pressed",
     "name": "khotkeys",
-    "project_path": "kde/workspace/khotkeys",
+    "project_path": "workspace/khotkeys",
     "repo_path": "plasma/khotkeys"
   },
   "khtml": {
@@ -2630,13 +2648,13 @@
   "kid3": {
     "description": "Efficient audio tagger that supports a large variety of file formats",
     "name": "kid3",
-    "project_path": "extragear/multimedia/kid3",
+    "project_path": "multimedia/kid3",
     "repo_path": "multimedia/kid3"
   },
   "kidentitymanagement": {
     "description": "Library to assist in handling user identities",
     "name": "kidentitymanagement",
-    "project_path": "kde/pim/kidentitymanagement",
+    "project_path": "pim/kidentitymanagement",
     "repo_path": "pim/kidentitymanagement"
   },
   "kidletime": {
@@ -2648,7 +2666,7 @@
   "kig": {
     "description": "Interactive Geometry",
     "name": "kig",
-    "project_path": "kde/kdeedu/kig",
+    "project_path": "kdeedu/kig",
     "repo_path": "education/kig"
   },
   "kig-data": {
@@ -2660,25 +2678,25 @@
   "kigo": {
     "description": "Kigo is an open-source implementation of the popular Go game",
     "name": "kigo",
-    "project_path": "kde/kdegames/kigo",
+    "project_path": "kdegames/kigo",
     "repo_path": "games/kigo"
   },
   "kije": {
     "description": "QtQuick library with widgets for desktop-oriented QtQuick applications.",
     "name": "kije",
-    "project_path": "playground/libs/kije",
+    "project_path": "libs/kije",
     "repo_path": "libraries/kije"
   },
   "kile": {
     "description": "Integrated LaTeX Editing Environment",
     "name": "kile",
-    "project_path": "extragear/office/kile",
+    "project_path": "office/kile",
     "repo_path": "office/kile"
   },
   "killbots": {
     "description": "Killbots is a simple game of evading killer robots",
     "name": "killbots",
-    "project_path": "kde/kdegames/killbots",
+    "project_path": "kdegames/killbots",
     "repo_path": "games/killbots"
   },
   "kimageformats": {
@@ -2690,25 +2708,25 @@
   "kimagemapeditor": {
     "description": "Generator of HTML image maps",
     "name": "kimagemapeditor",
-    "project_path": "kde/kdewebdev/kimagemapeditor",
+    "project_path": "kdewebdev/kimagemapeditor",
     "repo_path": "graphics/kimagemapeditor"
   },
   "kimap": {
     "description": "Library to assist working with IMAP servers",
     "name": "kimap",
-    "project_path": "kde/pim/kimap",
+    "project_path": "pim/kimap",
     "repo_path": "pim/kimap"
   },
   "kimap2": {
     "description": "Next-generation IMAP library",
     "name": "kimap2",
-    "project_path": "playground/pim/kimap2",
+    "project_path": "pim/kimap2",
     "repo_path": "pim/kimap2"
   },
   "kimono": {
     "description": ".NET/Mono bindings for the KDE libraries.",
     "name": "kimono",
-    "project_path": "kde/kdebindings/csharp/kimono",
+    "project_path": "kdebindings/csharp/kimono",
     "repo_path": "unmaintained/kimono"
   },
   "kimtoy": {
@@ -2720,7 +2738,7 @@
   "kinfocenter": {
     "description": "View information about your computer's hardware",
     "name": "kinfocenter",
-    "project_path": "kde/workspace/kinfocenter",
+    "project_path": "workspace/kinfocenter",
     "repo_path": "plasma/kinfocenter"
   },
   "kinit": {
@@ -2738,31 +2756,31 @@
   "kio-admin": {
     "description": "Manage files as administrator using the admin:// KIO protocol.",
     "name": "kio-admin",
-    "project_path": "extragear/sysadmin/kio-admin",
+    "project_path": "sysadmin/kio-admin",
     "repo_path": "system/kio-admin"
   },
   "kio-extras": {
     "description": "Additional components to increase the functionality of KIO",
     "name": "kio-extras",
-    "project_path": "kde/kdenetwork/kio-extras",
+    "project_path": "kdenetwork/kio-extras",
     "repo_path": "network/kio-extras"
   },
   "kio-fuse": {
     "description": "FUSE Interface for KIO",
     "name": "kio-fuse",
-    "project_path": "extragear/base/kio-fuse",
+    "project_path": "base/kio-fuse",
     "repo_path": "system/kio-fuse"
   },
   "kio-gdrive": {
     "description": "KIO Worker to access Google Drive",
     "name": "kio-gdrive",
-    "project_path": "kde/kdenetwork/kio-gdrive",
+    "project_path": "kdenetwork/kio-gdrive",
     "repo_path": "network/kio-gdrive"
   },
   "kio-gopher": {
     "description": "Gopher KIO Slave",
     "name": "kio-gopher",
-    "project_path": "extragear/network/kio-gopher",
+    "project_path": "network/kio-gopher",
     "repo_path": "network/kio-gopher"
   },
   "kio-mtp": {
@@ -2774,31 +2792,31 @@
   "kio-s3": {
     "description": "KIO interface for Amazon Web Services S3 storage",
     "name": "kio-s3",
-    "project_path": "extragear/network/kio-s3",
+    "project_path": "network/kio-s3",
     "repo_path": "network/kio-s3"
   },
   "kio-stash": {
     "description": "Virtual folder to simplify file selection in non-contiguous folder trees",
     "name": "kio-stash",
-    "project_path": "extragear/utils/kio-stash",
+    "project_path": "utils/kio-stash",
     "repo_path": "utilities/kio-stash"
   },
   "kio-upnp-ms": {
     "description": "KIO Slave for UPnP MediaServer devices",
     "name": "kio-upnp-ms",
-    "project_path": "playground/base/kio-upnp-ms",
+    "project_path": "base/kio-upnp-ms",
     "repo_path": "network/kio-upnp-ms"
   },
   "kio-zeroconf": {
     "description": "KIO worker to discover file systems by DNS-SD (zeroconf)",
     "name": "kio-zeroconf",
-    "project_path": "kde/kdenetwork/kio-zeroconf",
+    "project_path": "kdenetwork/kio-zeroconf",
     "repo_path": "network/kio-zeroconf"
   },
   "kipi-plugins": {
     "description": "Plugins extending KDE graphics apps, e.g. with import/export capabilities",
     "name": "kipi-plugins",
-    "project_path": "kde/kdegraphics/kipi-plugins",
+    "project_path": "kdegraphics/kipi-plugins",
     "repo_path": "graphics/kipi-plugins"
   },
   "kirigami": {
@@ -2810,31 +2828,31 @@
   "kirigami-addons": {
     "description": "Add-ons for the Kirigami framework",
     "name": "kirigami-addons",
-    "project_path": "extragear/libs/kirigami-addons",
+    "project_path": "libs/kirigami-addons",
     "repo_path": "libraries/kirigami-addons"
   },
   "kirigami-gallery": {
     "description": "Kirigami component gallery application",
     "name": "kirigami-gallery",
-    "project_path": "kde/kdesdk/kirigami-gallery",
+    "project_path": "kdesdk/kirigami-gallery",
     "repo_path": "sdk/kirigami-gallery"
   },
   "kiriki": {
     "description": "Kiriki is an addictive and fun dice game",
     "name": "kiriki",
-    "project_path": "kde/kdegames/kiriki",
+    "project_path": "kdegames/kiriki",
     "repo_path": "games/kiriki"
   },
   "kirogi": {
     "description": "Ground control application for drones",
     "name": "kirogi",
-    "project_path": "playground/base/kirogi",
+    "project_path": "base/kirogi",
     "repo_path": "utilities/kirogi"
   },
   "kiss": {
     "description": "KDE Initial System Setup",
     "name": "kiss",
-    "project_path": "playground/system/kiss",
+    "project_path": "system/kiss",
     "repo_path": "system/kiss"
   },
   "kitemmodels": {
@@ -2852,19 +2870,19 @@
   "kiten": {
     "description": "Japanese Reference/Study Tool",
     "name": "kiten",
-    "project_path": "kde/kdeedu/kiten",
+    "project_path": "kdeedu/kiten",
     "repo_path": "education/kiten"
   },
   "kitinerary": {
     "description": "Data Model and Extraction System for Travel Reservation information",
     "name": "kitinerary",
-    "project_path": "kde/pim/kitinerary",
+    "project_path": "pim/kitinerary",
     "repo_path": "pim/kitinerary"
   },
   "kitinerary-workbench": {
     "description": "KItinerary Test and Development Tool",
     "name": "kitinerary-workbench",
-    "project_path": "playground/pim/kitinerary-workbench",
+    "project_path": "pim/kitinerary-workbench",
     "repo_path": "pim/kitinerary-workbench"
   },
   "kjobwidgets": {
@@ -2876,13 +2894,13 @@
   "kjots": {
     "description": "Note taking application using Akonadi",
     "name": "kjots",
-    "project_path": "playground/pim/kjots",
+    "project_path": "pim/kjots",
     "repo_path": "pim/kjots"
   },
   "kjournald": {
     "description": "Framework for interacting with systemd-journald",
     "name": "kjournald",
-    "project_path": "kde/applications/kjournald",
+    "project_path": "applications/kjournald",
     "repo_path": "system/kjournald"
   },
   "kjs": {
@@ -2900,49 +2918,49 @@
   "kjumpingcube": {
     "description": "KJumpingCube is a simple tactical game",
     "name": "kjumpingcube",
-    "project_path": "kde/kdegames/kjumpingcube",
+    "project_path": "kdegames/kjumpingcube",
     "repo_path": "games/kjumpingcube"
   },
   "kldap": {
     "description": "Library to assist working with LDAP directories",
     "name": "kldap",
-    "project_path": "kde/pim/kldap",
+    "project_path": "pim/kldap",
     "repo_path": "pim/kldap"
   },
   "kleopatra": {
     "description": "Certificate manager and GUI for OpenPGP and CMS cryptography",
     "name": "kleopatra",
-    "project_path": "kde/pim/kleopatra",
+    "project_path": "pim/kleopatra",
     "repo_path": "pim/kleopatra"
   },
   "klettres": {
     "description": "Learn The Alphabet",
     "name": "klettres",
-    "project_path": "kde/kdeedu/klettres",
+    "project_path": "kdeedu/klettres",
     "repo_path": "education/klettres"
   },
   "klevernotes": {
     "description": "A note-taking and management application using markdown.",
     "name": "klevernotes",
-    "project_path": "extragear/office/klevernotes",
+    "project_path": "office/klevernotes",
     "repo_path": "office/klevernotes"
   },
   "klickety": {
     "description": "Klickety is an adaptation of the Clickomania game",
     "name": "klickety",
-    "project_path": "kde/kdegames/klickety",
+    "project_path": "kdegames/klickety",
     "repo_path": "games/klickety"
   },
   "klimbgrades": {
     "description": "Conversion utility for the difficulty rating of rock climbs",
     "name": "klimbgrades",
-    "project_path": "playground/utils/klimbgrades",
+    "project_path": "utils/klimbgrades",
     "repo_path": "utilities/klimbgrades"
   },
   "klines": {
     "description": "KLines is a simple but highly addictive, one player game",
     "name": "klines",
-    "project_path": "kde/kdegames/klines",
+    "project_path": "kdegames/klines",
     "repo_path": "games/klines"
   },
   "klinkstatus": {
@@ -2954,49 +2972,49 @@
   "klook": {
     "description": "Quick file content preview application with Dolphin integration",
     "name": "klook",
-    "project_path": "playground/base/klook",
+    "project_path": "base/klook",
     "repo_path": "graphics/klook"
   },
   "kmag": {
     "description": "Screen magnifier",
     "name": "kmag",
-    "project_path": "kde/kdeaccessibility/kmag",
+    "project_path": "kdeaccessibility/kmag",
     "repo_path": "accessibility/kmag"
   },
   "kmahjongg": {
     "description": "KMahjongg is a tile matching game for one or two players",
     "name": "kmahjongg",
-    "project_path": "kde/kdegames/kmahjongg",
+    "project_path": "kdegames/kmahjongg",
     "repo_path": "games/kmahjongg"
   },
   "kmail": {
     "description": "State-of-the-art feature-rich email client that supports many protocols",
     "name": "kmail",
-    "project_path": "kde/pim/kmail",
+    "project_path": "pim/kmail",
     "repo_path": "pim/kmail"
   },
   "kmail-account-wizard": {
     "description": "Application which assists you with the configuration of accounts in KMail",
     "name": "kmail-account-wizard",
-    "project_path": "kde/pim/kmail-account-wizard",
+    "project_path": "pim/kmail-account-wizard",
     "repo_path": "pim/kmail-account-wizard"
   },
   "kmailtransport": {
     "description": "Library, KCM and KDED module to manage mail transport",
     "name": "kmailtransport",
-    "project_path": "kde/pim/kmailtransport",
+    "project_path": "pim/kmailtransport",
     "repo_path": "pim/kmailtransport"
   },
   "kmarkdownwebview": {
     "description": "KPart for rendering Markdown content",
     "name": "kmarkdownwebview",
-    "project_path": "extragear/utils/kmarkdownwebview",
+    "project_path": "utils/kmarkdownwebview",
     "repo_path": "utilities/kmarkdownwebview"
   },
   "kmbox": {
     "description": "Library for working with MBox format files",
     "name": "kmbox",
-    "project_path": "kde/pim/kmbox",
+    "project_path": "pim/kmbox",
     "repo_path": "pim/kmbox"
   },
   "kmediaplayer": {
@@ -3008,73 +3026,73 @@
   "kmenuedit": {
     "description": "Menu Editor for Plasma Workspaces",
     "name": "kmenuedit",
-    "project_path": "kde/workspace/kmenuedit",
+    "project_path": "workspace/kmenuedit",
     "repo_path": "plasma/kmenuedit"
   },
   "kmime": {
     "description": "Library to assist handling MIME data",
     "name": "kmime",
-    "project_path": "kde/pim/kmime",
+    "project_path": "pim/kmime",
     "repo_path": "pim/kmime"
   },
   "kmines": {
     "description": "KMines is the classic Minesweeper game",
     "name": "kmines",
-    "project_path": "kde/kdegames/kmines",
+    "project_path": "kdegames/kmines",
     "repo_path": "games/kmines"
   },
   "kmix": {
     "description": "Volume control program",
     "name": "kmix",
-    "project_path": "kde/kdemultimedia/kmix",
+    "project_path": "kdemultimedia/kmix",
     "repo_path": "multimedia/kmix"
   },
   "kmoretools": {
     "description": "Support for downloading application assets from the network",
     "name": "kmoretools",
-    "project_path": "playground/libs/kmoretools",
+    "project_path": "libs/kmoretools",
     "repo_path": "libraries/kmoretools"
   },
   "kmousetool": {
     "description": "Program that clicks the mouse for you",
     "name": "kmousetool",
-    "project_path": "kde/kdeaccessibility/kmousetool",
+    "project_path": "kdeaccessibility/kmousetool",
     "repo_path": "accessibility/kmousetool"
   },
   "kmouth": {
     "description": "Type-and-say front end for speech synthesizers",
     "name": "kmouth",
-    "project_path": "kde/kdeaccessibility/kmouth",
+    "project_path": "kdeaccessibility/kmouth",
     "repo_path": "accessibility/kmouth"
   },
   "kmplayer": {
     "description": "KPart-based video player plugin",
     "name": "kmplayer",
-    "project_path": "extragear/multimedia/kmplayer",
+    "project_path": "multimedia/kmplayer",
     "repo_path": "multimedia/kmplayer"
   },
   "kmplot": {
     "description": "Mathematical Function Plotter",
     "name": "kmplot",
-    "project_path": "kde/kdeedu/kmplot",
+    "project_path": "kdeedu/kmplot",
     "repo_path": "education/kmplot"
   },
   "kmuddy": {
     "description": "A MUD (Multi-User Dungeon) client by KDE",
     "name": "kmuddy",
-    "project_path": "playground/games/kmuddy",
+    "project_path": "games/kmuddy",
     "repo_path": "games/kmuddy"
   },
   "kmymoney": {
     "description": "Personal finance manager",
     "name": "kmymoney",
-    "project_path": "extragear/office/kmymoney",
+    "project_path": "office/kmymoney",
     "repo_path": "office/kmymoney"
   },
   "knavalbattle": {
     "description": "Naval Battle is a ship sinking game",
     "name": "knavalbattle",
-    "project_path": "kde/kdegames/knavalbattle",
+    "project_path": "kdegames/knavalbattle",
     "repo_path": "games/knavalbattle"
   },
   "knemo": {
@@ -3086,7 +3104,7 @@
   "knetwalk": {
     "description": "KNetWalk: connect all the terminals to the server, in as few turns as possible",
     "name": "knetwalk",
-    "project_path": "kde/kdegames/knetwalk",
+    "project_path": "kdegames/knetwalk",
     "repo_path": "games/knetwalk"
   },
   "knewstuff": {
@@ -3098,19 +3116,19 @@
   "knights": {
     "description": "Chess board program.",
     "name": "knights",
-    "project_path": "kde/kdegames/knights",
+    "project_path": "kdegames/knights",
     "repo_path": "games/knights"
   },
   "knipptasch": {
     "description": "Personal accounting application that aims to be the simplest for basic use",
     "name": "knipptasch",
-    "project_path": "playground/office/knipptasch",
+    "project_path": "office/knipptasch",
     "repo_path": "office/knipptasch"
   },
   "knotes": {
     "description": "Note-taking application",
     "name": "knotes",
-    "project_path": "kde/pim/knotes",
+    "project_path": "pim/knotes",
     "repo_path": "pim/knotes"
   },
   "knotifications": {
@@ -3128,13 +3146,13 @@
   "kobjecttracking": {
     "description": "Library for tracking changes in QObject-based objects",
     "name": "kobjecttracking",
-    "project_path": "playground/sdk/kobjecttracking",
+    "project_path": "sdk/kobjecttracking",
     "repo_path": "sdk/kobjecttracking"
   },
   "kodaskanna": {
     "description": "A multi-format 1D/2D code scanner",
     "name": "kodaskanna",
-    "project_path": "playground/graphics/kodaskanna",
+    "project_path": "graphics/kodaskanna",
     "repo_path": "graphics/kodaskanna"
   },
   "koffice": {
@@ -3188,7 +3206,7 @@
   "koko": {
     "description": "Image gallery application",
     "name": "koko",
-    "project_path": "extragear/graphics/koko",
+    "project_path": "graphics/koko",
     "repo_path": "graphics/koko"
   },
   "kolena": {
@@ -3200,31 +3218,31 @@
   "kolf": {
     "description": "Kolf is a miniature golf game with 2d top-down view",
     "name": "kolf",
-    "project_path": "kde/kdegames/kolf",
+    "project_path": "kdegames/kolf",
     "repo_path": "games/kolf"
   },
   "kollision": {
     "description": "Kollision is a simple ball dodging game",
     "name": "kollision",
-    "project_path": "kde/kdegames/kollision",
+    "project_path": "kdegames/kollision",
     "repo_path": "games/kollision"
   },
   "kolor-manager": {
     "description": "Color management KCM using Oyranos CMS",
     "name": "kolor-manager",
-    "project_path": "extragear/graphics/kolor-manager",
+    "project_path": "graphics/kolor-manager",
     "repo_path": "graphics/kolor-manager"
   },
   "kolorfill": {
     "description": "Simple flood fill game",
     "name": "kolorfill",
-    "project_path": "playground/base/kolorfill",
+    "project_path": "base/kolorfill",
     "repo_path": "games/kolorfill"
   },
   "kolourpaint": {
     "description": "Easy-to-use paint program",
     "name": "kolourpaint",
-    "project_path": "kde/kdegraphics/kolourpaint",
+    "project_path": "kdegraphics/kolourpaint",
     "repo_path": "graphics/kolourpaint"
   },
   "kommander": {
@@ -3236,49 +3254,49 @@
   "kommit": {
     "description": "Graphical Git Client",
     "name": "kommit",
-    "project_path": "playground/sdk/kommit",
+    "project_path": "sdk/kommit",
     "repo_path": "sdk/kommit"
   },
   "kompare": {
     "description": "Graphical File Differences Tool",
     "name": "kompare",
-    "project_path": "kde/kdesdk/kompare",
+    "project_path": "kdesdk/kompare",
     "repo_path": "sdk/kompare"
   },
   "kongress": {
     "description": "Companion application for conferences",
     "name": "kongress",
-    "project_path": "extragear/utils/kongress",
+    "project_path": "utils/kongress",
     "repo_path": "utilities/kongress"
   },
   "konqueror": {
     "description": "Web browser and Swiss Army knife for any kind of file management and previewing",
     "name": "konqueror",
-    "project_path": "kde/applications/konqueror",
+    "project_path": "applications/konqueror",
     "repo_path": "network/konqueror"
   },
   "konquest": {
     "description": "Konquest is the KDE version of Gnu-Lactic",
     "name": "konquest",
-    "project_path": "kde/kdegames/konquest",
+    "project_path": "kdegames/konquest",
     "repo_path": "games/konquest"
   },
   "konsole": {
     "description": "Terminal emulator by KDE",
     "name": "konsole",
-    "project_path": "kde/applications/konsole",
+    "project_path": "applications/konsole",
     "repo_path": "utilities/konsole"
   },
   "kontact": {
     "description": "Container application to unify several major PIM applications",
     "name": "kontact",
-    "project_path": "kde/pim/kontact",
+    "project_path": "pim/kontact",
     "repo_path": "pim/kontact"
   },
   "kontactinterface": {
     "description": "Support libraries to assist integration with Kontact",
     "name": "kontactinterface",
-    "project_path": "kde/pim/kontactinterface",
+    "project_path": "pim/kontactinterface",
     "repo_path": "pim/kontactinterface"
   },
   "kontaminuti": {
@@ -3290,49 +3308,49 @@
   "kontrast": {
     "description": "Tool to check contrast for colors that allows verifying that your colors are correctly accessible",
     "name": "kontrast",
-    "project_path": "kde/kdeaccessibility/kontrast",
+    "project_path": "kdeaccessibility/kontrast",
     "repo_path": "accessibility/kontrast"
   },
   "konversation": {
     "description": "User-friendly and fully-featured IRC client",
     "name": "konversation",
-    "project_path": "kde/kdenetwork/konversation",
+    "project_path": "kdenetwork/konversation",
     "repo_path": "network/konversation"
   },
   "konvex": {
     "description": "3D Model Viewer",
     "name": "konvex",
-    "project_path": "playground/base/konvex",
+    "project_path": "base/konvex",
     "repo_path": "graphics/konvex"
   },
   "kooka": {
     "description": "Scanning application and libkscan library",
     "name": "kooka",
-    "project_path": "playground/graphics/kooka",
+    "project_path": "graphics/kooka",
     "repo_path": "graphics/kooka"
   },
   "kookbook": {
     "description": "Cookbook creator",
     "name": "kookbook",
-    "project_path": "playground/base/kookbook",
+    "project_path": "base/kookbook",
     "repo_path": "utilities/kookbook"
   },
   "kopeninghours": {
     "description": "Library for parsing and evaluating OSM opening hours expressions.",
     "name": "kopeninghours",
-    "project_path": "kde/pim/kopeninghours",
+    "project_path": "pim/kopeninghours",
     "repo_path": "libraries/kopeninghours"
   },
   "kopete": {
     "description": "Flexible multi-protocol instant messenger for personal and enterprise use",
     "name": "kopete",
-    "project_path": "kde/kdenetwork/kopete",
+    "project_path": "kdenetwork/kopete",
     "repo_path": "network/kopete"
   },
   "kopete-pimpresence": {
     "description": "PIM Presence Plugin for Kopete",
     "name": "kopete-pimpresence",
-    "project_path": "playground/network/kopete-pimpresence",
+    "project_path": "network/kopete-pimpresence",
     "repo_path": "unmaintained/kopete-pimpresence"
   },
   "kopete-protocol-telepathy": {
@@ -3380,19 +3398,19 @@
   "korganizer": {
     "description": "Organizational assistant, providing calendars and other similar functionality",
     "name": "korganizer",
-    "project_path": "kde/pim/korganizer",
+    "project_path": "pim/korganizer",
     "repo_path": "pim/korganizer"
   },
   "korundum": {
     "description": "Ruby bindings for libraries created by the KDE community.",
     "name": "korundum",
-    "project_path": "kde/kdebindings/ruby/korundum",
+    "project_path": "kdebindings/ruby/korundum",
     "repo_path": "unmaintained/korundum"
   },
   "kosmindoormap": {
     "description": "OSM multi-floor indoor map renderer",
     "name": "kosmindoormap",
-    "project_path": "kde/pim/kosmindoormap",
+    "project_path": "pim/kosmindoormap",
     "repo_path": "libraries/kosmindoormap"
   },
   "kpackage": {
@@ -3410,13 +3428,13 @@
   "kpaste": {
     "description": "command-line tool to paste to https://paste.kde.org",
     "name": "kpaste",
-    "project_path": "playground/utils/kpaste",
+    "project_path": "utils/kpaste",
     "repo_path": "unmaintained/kpaste"
   },
   "kpat": {
     "description": "KPatience offers a selection of solitaire card games",
     "name": "kpat",
-    "project_path": "kde/kdegames/kpat",
+    "project_path": "kdegames/kpat",
     "repo_path": "games/kpat"
   },
   "kpeg": {
@@ -3434,37 +3452,37 @@
   "kpeoplesink": {
     "description": "Expose Sink contacts to KPeople",
     "name": "kpeoplesink",
-    "project_path": "playground/pim/kpeoplesink",
+    "project_path": "pim/kpeoplesink",
     "repo_path": "pim/kpeoplesink"
   },
   "kpeoplevcard": {
     "description": "Expose VCard contacts to KPeople",
     "name": "kpeoplevcard",
-    "project_path": "kdereview/kpeoplevcard",
+    "project_path": "kpeoplevcard",
     "repo_path": "pim/kpeoplevcard"
   },
   "kphotoalbum": {
     "description": "Photo Album for easy organization of your images",
     "name": "kphotoalbum",
-    "project_path": "extragear/graphics/kphotoalbum",
+    "project_path": "graphics/kphotoalbum",
     "repo_path": "graphics/kphotoalbum"
   },
   "kpimtextedit": {
     "description": "Library that provides extended text editor for PIM applications",
     "name": "kpimtextedit",
-    "project_path": "kde/pim/kpimtextedit",
+    "project_path": "pim/kpimtextedit",
     "repo_path": "pim/kpimtextedit"
   },
   "kpipewire": {
     "description": "Components relating to Flatpak 'pipewire' use in Plasma.",
     "name": "kpipewire",
-    "project_path": "kde/workspace/kpipewire",
+    "project_path": "workspace/kpipewire",
     "repo_path": "plasma/kpipewire"
   },
   "kpkpass": {
     "description": "Apple Wallet Pass reader",
     "name": "kpkpass",
-    "project_path": "kde/pim/kpkpass",
+    "project_path": "pim/kpkpass",
     "repo_path": "pim/kpkpass"
   },
   "kplayer": {
@@ -3482,7 +3500,7 @@
   "kpmcore": {
     "description": "KDE Partition Manager core library",
     "name": "kpmcore",
-    "project_path": "kde/kdeadmin/kpmcore",
+    "project_path": "kdeadmin/kpmcore",
     "repo_path": "system/kpmcore"
   },
   "kppp": {
@@ -3500,7 +3518,7 @@
   "kproperty": {
     "description": "Property editing framework with an editor widget similar to Qt Designer",
     "name": "kproperty",
-    "project_path": "extragear/libs/kproperty",
+    "project_path": "libs/kproperty",
     "repo_path": "libraries/kproperty"
   },
   "kpty": {
@@ -3512,19 +3530,19 @@
   "kpublicalerts": {
     "description": "Public emergency and weather alert notification.",
     "name": "kpublicalerts",
-    "project_path": "playground/utils/kpublicalerts",
+    "project_path": "utils/kpublicalerts",
     "repo_path": "utilities/kpublicalerts"
   },
   "kpublictransport": {
     "description": "Library to assist with accessing public transport timetables and other data",
     "name": "kpublictransport",
-    "project_path": "kde/pim/kpublictransport",
+    "project_path": "pim/kpublictransport",
     "repo_path": "libraries/kpublictransport"
   },
   "kqtquickcharts": {
     "description": "QtQuick plugin to render beautiful and interactive charts",
     "name": "kqtquickcharts",
-    "project_path": "kde/kdeedu/kqtquickcharts",
+    "project_path": "kdeedu/kqtquickcharts",
     "repo_path": "libraries/kqtquickcharts"
   },
   "kquickcharts": {
@@ -3536,31 +3554,31 @@
   "kquickchatcomponents": {
     "description": "Set of chat components for QtQuick chat apps wishing to fit in with KDE's collection of chat apps",
     "name": "kquickchatcomponents",
-    "project_path": "kdereview/kquickchatcomponents",
+    "project_path": "kquickchatcomponents",
     "repo_path": "libraries/kquickchatcomponents"
   },
   "kquickimageeditor": {
     "description": "Image editing components",
     "name": "kquickimageeditor",
-    "project_path": "extragear/libs/kquickimageeditor",
+    "project_path": "libs/kquickimageeditor",
     "repo_path": "libraries/kquickimageeditor"
   },
   "kquickitemviews": {
     "description": "Qt Model compatibility layer for QML",
     "name": "kquickitemviews",
-    "project_path": "playground/libs/kquickitemviews",
+    "project_path": "libs/kquickitemviews",
     "repo_path": "libraries/kquickitemviews"
   },
   "krdc": {
     "description": "Remote Desktop Client",
     "name": "krdc",
-    "project_path": "kde/kdenetwork/krdc",
+    "project_path": "kdenetwork/krdc",
     "repo_path": "network/krdc"
   },
   "krdp": {
     "description": "Library and examples for creating an RDP server.",
     "name": "krdp",
-    "project_path": "kde/workspace/krdp",
+    "project_path": "workspace/krdp",
     "repo_path": "plasma/krdp"
   },
   "krecipes": {
@@ -3572,19 +3590,19 @@
   "krecorder": {
     "description": "Audio recorder for Plasma Mobile and other platforms",
     "name": "krecorder",
-    "project_path": "extragear/utils/krecorder",
+    "project_path": "utils/krecorder",
     "repo_path": "utilities/krecorder"
   },
   "kreenshot-editor": {
     "description": "Kreenshot Editor is a screenshot image editing application and shared library.",
     "name": "kreenshot-editor",
-    "project_path": "playground/graphics/kreenshot-editor",
+    "project_path": "graphics/kreenshot-editor",
     "repo_path": "unmaintained/kreenshot-editor"
   },
   "kregexpeditor": {
     "description": "GUI for creating and editing regular expressions",
     "name": "kregexpeditor",
-    "project_path": "playground/utils/kregexpeditor",
+    "project_path": "utils/kregexpeditor",
     "repo_path": "utilities/kregexpeditor"
   },
   "kremotecontrol": {
@@ -3596,97 +3614,97 @@
   "krename": {
     "description": "Utility to handle specialized file renames",
     "name": "krename",
-    "project_path": "extragear/utils/krename",
+    "project_path": "utils/krename",
     "repo_path": "utilities/krename"
   },
   "kreport": {
     "description": "Framework for creation and generation of reports in multiple formats",
     "name": "kreport",
-    "project_path": "extragear/libs/kreport",
+    "project_path": "libs/kreport",
     "repo_path": "libraries/kreport"
   },
   "kreversi": {
     "description": "KReversi is is a simple one player strategy game played against the computer",
     "name": "kreversi",
-    "project_path": "kde/kdegames/kreversi",
+    "project_path": "kdegames/kreversi",
     "repo_path": "games/kreversi"
   },
   "krfb": {
     "description": "Desktop Sharing",
     "name": "krfb",
-    "project_path": "kde/kdenetwork/krfb",
+    "project_path": "kdenetwork/krfb",
     "repo_path": "network/krfb"
   },
   "krita": {
     "description": "Krita is a free and open source cross-platform application that offers an end-to-end solution for creating digital art files from scratch built on the KDE and Qt frameworks.",
     "name": "krita",
-    "project_path": "extragear/graphics/krita",
+    "project_path": "graphics/krita",
     "repo_path": "graphics/krita"
   },
   "krita-analogies": {
     "description": "Filter that tries to restyle an image using comparison with other images.",
     "name": "krita-analogies",
-    "project_path": "extragear/graphics/krita-extensions/krita-analogies",
+    "project_path": "graphics/krita-extensions/krita-analogies",
     "repo_path": "unmaintained/krita-analogies"
   },
   "krita-ci-utilities": {
     "description": "CI/CD utilities for Krita builds",
     "name": "krita-ci-utilities",
-    "project_path": "playground/packaging/krita-ci-utilities",
+    "project_path": "packaging/krita-ci-utilities",
     "repo_path": "packaging/krita-ci-utilities"
   },
   "krita-cimg": {
     "description": "Extension based on the cimg library. http://cimg.sourceforge.net/",
     "name": "krita-cimg",
-    "project_path": "extragear/graphics/krita-extensions/krita-cimg",
+    "project_path": "graphics/krita-extensions/krita-cimg",
     "repo_path": "unmaintained/krita-cimg"
   },
   "krita-ctlbrush": {
     "description": "Brush written using the Color Transformation Language.",
     "name": "krita-ctlbrush",
-    "project_path": "extragear/graphics/krita-extensions/krita-ctlbrush",
+    "project_path": "graphics/krita-extensions/krita-ctlbrush",
     "repo_path": "unmaintained/krita-ctlbrush"
   },
   "krita-deps-management": {
     "description": "Dependencies management for Krita builds across the various platforms it supports",
     "name": "krita-deps-management",
-    "project_path": "playground/packaging/krita-deps-management",
+    "project_path": "packaging/krita-deps-management",
     "repo_path": "packaging/krita-deps-management"
   },
   "krita-deskew": {
     "description": "Deskew rotates an image such that text is straight, which is useful when dealing with scanned images.",
     "name": "krita-deskew",
-    "project_path": "extragear/graphics/krita-extensions/krita-deskew",
+    "project_path": "graphics/krita-extensions/krita-deskew",
     "repo_path": "unmaintained/krita-deskew"
   },
   "krita-dither": {
     "description": "A dithering plugin for Krita.",
     "name": "krita-dither",
-    "project_path": "extragear/graphics/krita-extensions/krita-dither",
+    "project_path": "graphics/krita-extensions/krita-dither",
     "repo_path": "unmaintained/krita-dither"
   },
   "krita-grayscalizer": {
     "description": "Simulate the use of \u201clens filter\u201d for creating grayscale images.",
     "name": "krita-grayscalizer",
-    "project_path": "extragear/graphics/krita-extensions/krita-grayscalizer",
+    "project_path": "graphics/krita-extensions/krita-grayscalizer",
     "repo_path": "unmaintained/krita-grayscalizer"
   },
   "krita-humanbody": {
     "description": "Canvas decoration that display the outline of a human to help choosing the pose when drawing.",
     "name": "krita-humanbody",
-    "project_path": "extragear/graphics/krita-extensions/krita-humanbody",
+    "project_path": "graphics/krita-extensions/krita-humanbody",
     "repo_path": "unmaintained/krita-humanbody"
   },
   "krita-imagecomplete": {
     "description": "ImageComplete fills in holes in your image with the gradient of the surround",
     "name": "krita-imagecomplete",
-    "project_path": "extragear/graphics/krita-extensions/krita-imagecomplete",
+    "project_path": "graphics/krita-extensions/krita-imagecomplete",
     "repo_path": "unmaintained/krita-imagecomplete"
   },
   "krita-linesampler": {
     "description": "LineSampler \u201csamples\u201d the image with randomly placed lines.",
     "name": "krita-linesampler",
-    "project_path": "extragear/graphics/krita-extensions/krita-linesampler",
+    "project_path": "graphics/krita-extensions/krita-linesampler",
     "repo_path": "unmaintained/krita-linesampler"
   },
   "krita-marketing": {
@@ -3698,7 +3716,7 @@
   "krita-pyramidalsharpening": {
     "description": "Use a pyramid to reconstruct a sharper image.",
     "name": "krita-pyramidalsharpening",
-    "project_path": "extragear/graphics/krita-extensions/krita-pyramidalsharpening",
+    "project_path": "graphics/krita-extensions/krita-pyramidalsharpening",
     "repo_path": "unmaintained/krita-pyramidalsharpening"
   },
   "krono": {
@@ -3710,7 +3728,7 @@
   "kronometer": {
     "description": "Stopwatch application by KDE",
     "name": "kronometer",
-    "project_path": "extragear/utils/kronometer",
+    "project_path": "utils/kronometer",
     "repo_path": "utilities/kronometer"
   },
   "kross": {
@@ -3722,13 +3740,13 @@
   "kross-interpreters": {
     "description": "Language interpreters to enable in-process scripting with Kross",
     "name": "kross-interpreters",
-    "project_path": "kde/kdebindings/kross-interpreters",
+    "project_path": "kdebindings/kross-interpreters",
     "repo_path": "libraries/kross-interpreters"
   },
   "kruler": {
     "description": "A pixel measuring tool by KDE",
     "name": "kruler",
-    "project_path": "kde/kdegraphics/kruler",
+    "project_path": "kdegraphics/kruler",
     "repo_path": "graphics/kruler"
   },
   "krunner": {
@@ -3740,13 +3758,13 @@
   "krusader": {
     "description": "Advanced twin panel (commander style) file manager",
     "name": "krusader",
-    "project_path": "extragear/utils/krusader",
+    "project_path": "utils/krusader",
     "repo_path": "utilities/krusader"
   },
   "ksanecore": {
     "description": "Library providing logic to interface scanners",
     "name": "ksanecore",
-    "project_path": "extragear/libraries/ksanecore",
+    "project_path": "libraries/ksanecore",
     "repo_path": "libraries/ksanecore"
   },
   "ksaneplugin": {
@@ -3764,31 +3782,31 @@
   "kscd": {
     "description": "CD player by KDE",
     "name": "kscd",
-    "project_path": "playground/multimedia/kscd",
+    "project_path": "multimedia/kscd",
     "repo_path": "multimedia/kscd"
   },
   "kscreen": {
     "description": "KDE's screen management software",
     "name": "kscreen",
-    "project_path": "kde/workspace/kscreen",
+    "project_path": "workspace/kscreen",
     "repo_path": "plasma/kscreen"
   },
   "kscreenlocker": {
     "description": "Library and components for secure lock screen architecture",
     "name": "kscreenlocker",
-    "project_path": "kde/workspace/kscreenlocker",
+    "project_path": "workspace/kscreenlocker",
     "repo_path": "plasma/kscreenlocker"
   },
   "ksecrets": {
     "description": "Secrets management infrastructure",
     "name": "ksecrets",
-    "project_path": "playground/utils/ksecrets",
+    "project_path": "utils/ksecrets",
     "repo_path": "utilities/ksecrets"
   },
   "kseexpr": {
     "description": "The embeddable expression engine fork for Krita",
     "name": "kseexpr",
-    "project_path": "kdereview/kseexpr",
+    "project_path": "kseexpr",
     "repo_path": "graphics/kseexpr"
   },
   "kservice": {
@@ -3800,35 +3818,35 @@
   "kshim": {
     "description": "Create a shim to help run your project",
     "name": "kshim",
-    "project_path": "playground/sdk/kshim",
+    "project_path": "sdk/kshim",
     "repo_path": "sdk/kshim"
   },
   "kshisen": {
     "description": "Shisen-Sho is a solitaire-like game played using the standard set of Mahjong tiles",
     "name": "kshisen",
-    "project_path": "kde/kdegames/kshisen",
+    "project_path": "kdegames/kshisen",
     "repo_path": "games/kshisen"
   },
   "ksirk": {
     "description": "KsirK is a computerized version of a well known strategy game",
     "name": "ksirk",
-    "project_path": "kde/kdegames/ksirk",
+    "project_path": "kdegames/ksirk",
     "repo_path": "games/ksirk"
   },
   "ksmtp": {
     "description": "Job-based library to send email through an SMTP server",
     "name": "ksmtp",
-    "project_path": "kde/pim/ksmtp",
+    "project_path": "pim/ksmtp",
     "repo_path": "pim/ksmtp"
   },
   "ksnakeduel": {
     "description": "KSnakeDuel is a simple snake duel game",
     "name": "ksnakeduel",
-    "project_path": "kde/kdegames/ksnakeduel",
+    "project_path": "kdegames/ksnakeduel",
     "repo_path": "games/ksnakeduel"
   },
   "ksnapshot": {
-    "description": "A handy utility primarily designed for taking screenshots\n\nGet KIPI plugins for \"more features\":https://www.elpauer.org/?p=509",
+    "description": "A handy utility primarily designed for taking screenshots",
     "name": "ksnapshot",
     "project_path": "unmaintained/ksnapshot",
     "repo_path": "unmaintained/ksnapshot"
@@ -3836,31 +3854,31 @@
   "kspaceduel": {
     "description": "KSpaceDuel: each of two possible players controls a satellite spaceship orbiting the sun",
     "name": "kspaceduel",
-    "project_path": "kde/kdegames/kspaceduel",
+    "project_path": "kdegames/kspaceduel",
     "repo_path": "games/kspaceduel"
   },
   "ksquares": {
     "description": "KSquares is modeled after the well known pen and paper based game of Dots and Boxes",
     "name": "ksquares",
-    "project_path": "kde/kdegames/ksquares",
+    "project_path": "kdegames/ksquares",
     "repo_path": "games/ksquares"
   },
   "ksshaskpass": {
     "description": "ssh-add helper that uses KWallet and KPasswordDialog",
     "name": "ksshaskpass",
-    "project_path": "kde/workspace/ksshaskpass",
+    "project_path": "workspace/ksshaskpass",
     "repo_path": "plasma/ksshaskpass"
   },
   "kst-plot": {
     "description": "Fast real-time plotting program with light data analysis capabilities",
     "name": "kst-plot",
-    "project_path": "extragear/graphics/kst-plot",
+    "project_path": "graphics/kst-plot",
     "repo_path": "graphics/kst-plot"
   },
   "kstars": {
     "description": "Desktop Planetarium",
     "name": "kstars",
-    "project_path": "extragear/edu/kstars",
+    "project_path": "edu/kstars",
     "repo_path": "education/kstars"
   },
   "kstatusnotifieritem": {
@@ -3872,7 +3890,7 @@
   "ksudoku": {
     "description": "KSudoku is a logic-based symbol placement puzzle",
     "name": "ksudoku",
-    "project_path": "kde/kdegames/ksudoku",
+    "project_path": "kdegames/ksudoku",
     "repo_path": "games/ksudoku"
   },
   "ksvg": {
@@ -3884,43 +3902,43 @@
   "ksysguard": {
     "description": "Resource usage monitor for your computer",
     "name": "ksysguard",
-    "project_path": "kde/workspace/ksysguard",
+    "project_path": "workspace/ksysguard",
     "repo_path": "plasma/ksysguard"
   },
   "ksystemlog": {
     "description": "KDE SystemLog Application",
     "name": "ksystemlog",
-    "project_path": "kde/kdeadmin/ksystemlog",
+    "project_path": "kdeadmin/ksystemlog",
     "repo_path": "system/ksystemlog"
   },
   "ksystemstats": {
     "description": "A plugin based system monitoring daemon.",
     "name": "ksystemstats",
-    "project_path": "kde/workspace/ksystemstats",
+    "project_path": "workspace/ksystemstats",
     "repo_path": "plasma/ksystemstats"
   },
   "kte-collaborative": {
     "description": "KTextEditor plugin which allows to edit text documents collaboratively",
     "name": "kte-collaborative",
-    "project_path": "playground/network/kte-collaborative",
+    "project_path": "network/kte-collaborative",
     "repo_path": "network/kte-collaborative"
   },
   "kteatime": {
     "description": "Handy timer for steeping tea",
     "name": "kteatime",
-    "project_path": "kde/kdeutils/kteatime",
+    "project_path": "kdeutils/kteatime",
     "repo_path": "utilities/kteatime"
   },
   "ktechlab": {
     "description": "IDE for microcontrollers and electronics",
     "name": "ktechlab",
-    "project_path": "playground/devtools/ktechlab",
+    "project_path": "devtools/ktechlab",
     "repo_path": "sdk/ktechlab"
   },
   "ktextaddons": {
     "description": "Various text handling addons",
     "name": "ktextaddons",
-    "project_path": "playground/libs/ktextaddons",
+    "project_path": "libs/ktextaddons",
     "repo_path": "libraries/ktextaddons"
   },
   "ktexteditor": {
@@ -3950,37 +3968,37 @@
   "ktimer": {
     "description": "Little tool to execute programs after some time",
     "name": "ktimer",
-    "project_path": "kde/kdeutils/ktimer",
+    "project_path": "kdeutils/ktimer",
     "repo_path": "utilities/ktimer"
   },
   "ktimetracker": {
     "description": "Todo management and time tracker",
     "name": "ktimetracker",
-    "project_path": "extragear/pim/ktimetracker",
+    "project_path": "pim/ktimetracker",
     "repo_path": "pim/ktimetracker"
   },
   "ktnef": {
     "description": "Libraries to work with TNEF Email Attachments",
     "name": "ktnef",
-    "project_path": "kde/pim/ktnef",
+    "project_path": "pim/ktnef",
     "repo_path": "pim/ktnef"
   },
   "ktorrent": {
     "description": "Powerful BitTorrent client",
     "name": "ktorrent",
-    "project_path": "kde/kdenetwork/ktorrent",
+    "project_path": "kdenetwork/ktorrent",
     "repo_path": "network/ktorrent"
   },
   "ktouch": {
     "description": "Touch Typing Tutor",
     "name": "ktouch",
-    "project_path": "kde/kdeedu/ktouch",
+    "project_path": "kdeedu/ktouch",
     "repo_path": "education/ktouch"
   },
   "ktp-accounts-kcm": {
     "description": "KCM for configuring Telepathy Instant Messaging Accounts",
     "name": "ktp-accounts-kcm",
-    "project_path": "kde/kdenetwork/ktp-accounts-kcm",
+    "project_path": "kdenetwork/ktp-accounts-kcm",
     "repo_path": "network/ktp-accounts-kcm"
   },
   "ktp-active": {
@@ -3992,49 +4010,49 @@
   "ktp-approver": {
     "description": "KDE channel approver for Telepathy",
     "name": "ktp-approver",
-    "project_path": "kde/kdenetwork/ktp-approver",
+    "project_path": "kdenetwork/ktp-approver",
     "repo_path": "network/ktp-approver"
   },
   "ktp-auth-handler": {
     "description": "UI/KWallet integration for passwords and SSL errors on account connection",
     "name": "ktp-auth-handler",
-    "project_path": "kde/kdenetwork/ktp-auth-handler",
+    "project_path": "kdenetwork/ktp-auth-handler",
     "repo_path": "network/ktp-auth-handler"
   },
   "ktp-call-ui": {
     "description": "Voice/video call UI for Telepathy",
     "name": "ktp-call-ui",
-    "project_path": "kde/kdenetwork/ktp-call-ui",
+    "project_path": "kdenetwork/ktp-call-ui",
     "repo_path": "network/ktp-call-ui"
   },
   "ktp-common-internals": {
     "description": "Library for KTp",
     "name": "ktp-common-internals",
-    "project_path": "kde/kdenetwork/ktp-common-internals",
+    "project_path": "kdenetwork/ktp-common-internals",
     "repo_path": "network/ktp-common-internals"
   },
   "ktp-contact-list": {
     "description": "Telepathy contact list application",
     "name": "ktp-contact-list",
-    "project_path": "kde/kdenetwork/ktp-contact-list",
+    "project_path": "kdenetwork/ktp-contact-list",
     "repo_path": "network/ktp-contact-list"
   },
   "ktp-contact-runner": {
     "description": "KRunner plugin for KDE Telepathy",
     "name": "ktp-contact-runner",
-    "project_path": "kde/kdenetwork/ktp-contact-runner",
+    "project_path": "kdenetwork/ktp-contact-runner",
     "repo_path": "network/ktp-contact-runner"
   },
   "ktp-desktop-applets": {
     "description": "KDE Telepathy applets for the Plasma Desktop",
     "name": "ktp-desktop-applets",
-    "project_path": "kde/kdenetwork/ktp-desktop-applets",
+    "project_path": "kdenetwork/ktp-desktop-applets",
     "repo_path": "network/ktp-desktop-applets"
   },
   "ktp-filetransfer-handler": {
     "description": "Telepathy file transfer handler",
     "name": "ktp-filetransfer-handler",
-    "project_path": "kde/kdenetwork/ktp-filetransfer-handler",
+    "project_path": "kdenetwork/ktp-filetransfer-handler",
     "repo_path": "network/ktp-filetransfer-handler"
   },
   "ktp-kde": {
@@ -4046,7 +4064,7 @@
   "ktp-kded-module": {
     "description": "KDED module for KDE Telepathy that takes care of system integration",
     "name": "ktp-kded-module",
-    "project_path": "kde/kdenetwork/ktp-kded-module",
+    "project_path": "kdenetwork/ktp-kded-module",
     "repo_path": "network/ktp-kded-module"
   },
   "ktp-kipi-plugin": {
@@ -4076,7 +4094,7 @@
   "ktp-send-file": {
     "description": "File manager plugin to launch a file transfer job with a specified contact",
     "name": "ktp-send-file",
-    "project_path": "kde/kdenetwork/ktp-send-file",
+    "project_path": "kdenetwork/ktp-send-file",
     "repo_path": "network/ktp-send-file"
   },
   "ktp-ssh-contact": {
@@ -4086,7 +4104,7 @@
     "repo_path": "unmaintained/ktp-ssh-contact"
   },
   "ktp-test-tool": {
-    "description": "A tool for testing out the various components of the KDE Telepathy.\n\nDEPRECATED",
+    "description": "A tool for testing out the various components of the KDE Telepathy",
     "name": "ktp-test-tool",
     "project_path": "unmaintained/ktp-test-tool",
     "repo_path": "unmaintained/ktp-test-tool"
@@ -4100,25 +4118,25 @@
   "ktp-text-ui": {
     "description": "Telepathy handler for text chats",
     "name": "ktp-text-ui",
-    "project_path": "kde/kdenetwork/ktp-text-ui",
+    "project_path": "kdenetwork/ktp-text-ui",
     "repo_path": "network/ktp-text-ui"
   },
   "ktrip": {
     "description": "Public Transport Assistance for Mobile Devices",
     "name": "ktrip",
-    "project_path": "extragear/utils/ktrip",
+    "project_path": "utils/ktrip",
     "repo_path": "utilities/ktrip"
   },
   "ktuberling": {
     "description": "KTuberling is a simple constructor game suitable for children and adults alike",
     "name": "ktuberling",
-    "project_path": "kde/kdegames/ktuberling",
+    "project_path": "kdegames/ktuberling",
     "repo_path": "games/ktuberling"
   },
   "kturtle": {
     "description": "Educational programming environment that uses TurtleSpeak",
     "name": "kturtle",
-    "project_path": "kde/kdeedu/kturtle",
+    "project_path": "kdeedu/kturtle",
     "repo_path": "education/kturtle"
   },
   "kturtle-data": {
@@ -4142,7 +4160,7 @@
   "kube": {
     "description": "Modern groupware client based on QtQuick and Sink",
     "name": "kube",
-    "project_path": "playground/pim/kube",
+    "project_path": "pim/kube",
     "repo_path": "pim/kube"
   },
   "kubeplayer": {
@@ -4154,37 +4172,37 @@
   "kubrick": {
     "description": "Kubrick is based on the famous Rubik's Cube",
     "name": "kubrick",
-    "project_path": "kde/kdegames/kubrick",
+    "project_path": "kdegames/kubrick",
     "repo_path": "games/kubrick"
   },
   "kubuntu-debug-installer": {
     "description": "Program to install debug packages for DrKonqi on Kubuntu",
     "name": "kubuntu-debug-installer",
-    "project_path": "playground/base/kubuntu-debug-installer",
+    "project_path": "base/kubuntu-debug-installer",
     "repo_path": "system/kubuntu-debug-installer"
   },
   "kubuntu-driver-kcm": {
     "description": "KCM that uses Ubuntu driver management system to install proprietary drivers",
     "name": "kubuntu-driver-kcm",
-    "project_path": "playground/base/kubuntu-driver-kcm",
+    "project_path": "base/kubuntu-driver-kcm",
     "repo_path": "system/kubuntu-driver-kcm"
   },
   "kubuntu-notification-helper": {
     "description": "Daemon that presents various notifications to Kubuntu users",
     "name": "kubuntu-notification-helper",
-    "project_path": "playground/base/kubuntu-notification-helper",
+    "project_path": "base/kubuntu-notification-helper",
     "repo_path": "system/kubuntu-notification-helper"
   },
   "kuickshow": {
     "description": "A fast and convenient image viewer",
     "name": "kuickshow",
-    "project_path": "playground/graphics/kuickshow",
+    "project_path": "graphics/kuickshow",
     "repo_path": "graphics/kuickshow"
   },
   "kunifiedpush": {
     "description": "UnifiedPush client components",
     "name": "kunifiedpush",
-    "project_path": "playground/libraries/kunifiedpush",
+    "project_path": "libraries/kunifiedpush",
     "repo_path": "libraries/kunifiedpush"
   },
   "kunitconversion": {
@@ -4196,7 +4214,7 @@
   "kup": {
     "description": "Backup scheduler for the Plasma desktop",
     "name": "kup",
-    "project_path": "extragear/system/kup",
+    "project_path": "system/kup",
     "repo_path": "system/kup"
   },
   "kuser": {
@@ -4232,55 +4250,55 @@
   "kwallet-pam": {
     "description": "PAM Integration with KWallet - Unlock KWallet when you login",
     "name": "kwallet-pam",
-    "project_path": "kde/workspace/kwallet-pam",
+    "project_path": "workspace/kwallet-pam",
     "repo_path": "plasma/kwallet-pam"
   },
   "kwalletmanager": {
     "description": "Tool to manage the passwords on your system",
     "name": "kwalletmanager",
-    "project_path": "kde/kdeutils/kwalletmanager",
+    "project_path": "kdeutils/kwalletmanager",
     "repo_path": "utilities/kwalletmanager"
   },
   "kwave": {
     "description": "Sound editor by KDE",
     "name": "kwave",
-    "project_path": "kde/kdemultimedia/kwave",
+    "project_path": "kdemultimedia/kwave",
     "repo_path": "multimedia/kwave"
   },
   "kwayland": {
     "description": "KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.",
     "name": "kwayland",
-    "project_path": "kde/workspace/kwayland",
+    "project_path": "workspace/kwayland",
     "repo_path": "plasma/kwayland"
   },
   "kwayland-integration": {
     "description": "Integration plugins for various KDE frameworks for the Wayland windowing system",
     "name": "kwayland-integration",
-    "project_path": "kde/workspace/kwayland-integration",
+    "project_path": "workspace/kwayland-integration",
     "repo_path": "plasma/kwayland-integration"
   },
   "kwayland-server": {
     "description": "Wayland Server Components built on KDE Frameworks",
     "name": "kwayland-server",
-    "project_path": "kde/workspace/kwayland-server",
+    "project_path": "workspace/kwayland-server",
     "repo_path": "plasma/kwayland-server"
   },
   "kweather": {
     "description": "Weather application for Plasma Mobile",
     "name": "kweather",
-    "project_path": "extragear/utils/kweather",
+    "project_path": "utils/kweather",
     "repo_path": "utilities/kweather"
   },
   "kweathercore": {
     "description": "Library to facilitate retrieval of weather information including forecasts and alerts",
     "name": "kweathercore",
-    "project_path": "extragear/libs/kweathercore",
+    "project_path": "libs/kweathercore",
     "repo_path": "libraries/kweathercore"
   },
   "kwebkitpart": {
     "description": "WebKit browser component available as KPart",
     "name": "kwebkitpart",
-    "project_path": "extragear/base/kwebkitpart",
+    "project_path": "base/kwebkitpart",
     "repo_path": "libraries/kwebkitpart"
   },
   "kwhiteboard": {
@@ -4298,19 +4316,19 @@
   "kwin": {
     "description": "Easy to use, but flexible, Wayland Compositor",
     "name": "kwin",
-    "project_path": "kde/workspace/kwin",
+    "project_path": "workspace/kwin",
     "repo_path": "plasma/kwin"
   },
   "kwin-x11": {
     "description": "Easy to use, but flexible, X Window Manager",
     "name": "kwin-x11",
-    "project_path": "kde/workspace/kwin-x11",
+    "project_path": "workspace/kwin-x11",
     "repo_path": "plasma/kwin-x11"
   },
   "kwindowsaddons": {
     "description": "Runtime components for KDE software on Windows",
     "name": "kwindowsaddons",
-    "project_path": "playground/base/kwindowsaddons",
+    "project_path": "base/kwindowsaddons",
     "repo_path": "libraries/kwindowsaddons"
   },
   "kwindowsystem": {
@@ -4322,19 +4340,19 @@
   "kwooty": {
     "description": "Friendly newsgroup binary downloader for Usenet",
     "name": "kwooty",
-    "project_path": "playground/network/kwooty",
+    "project_path": "network/kwooty",
     "repo_path": "network/kwooty"
   },
   "kwordquiz": {
     "description": "Flash Card Trainer",
     "name": "kwordquiz",
-    "project_path": "kde/kdeedu/kwordquiz",
+    "project_path": "kdeedu/kwordquiz",
     "repo_path": "education/kwordquiz"
   },
   "kwrited": {
     "description": "Listen to traditional system notifications",
     "name": "kwrited",
-    "project_path": "kde/workspace/kwrited",
+    "project_path": "workspace/kwrited",
     "repo_path": "plasma/kwrited"
   },
   "kxmlgui": {
@@ -4352,31 +4370,31 @@
   "kxstitch": {
     "description": "Cross stitch pattern and chart creation",
     "name": "kxstitch",
-    "project_path": "extragear/graphics/kxstitch",
+    "project_path": "graphics/kxstitch",
     "repo_path": "graphics/kxstitch"
   },
   "labplot": {
     "description": "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone.",
     "name": "labplot",
-    "project_path": "extragear/edu/labplot",
+    "project_path": "edu/labplot",
     "repo_path": "education/labplot"
   },
   "lancelot": {
     "description": "Alternative launcher for Plasma with a more complete set of features compared to the default",
     "name": "lancelot",
-    "project_path": "playground/base/lancelot",
+    "project_path": "base/lancelot",
     "repo_path": "plasma/lancelot"
   },
   "latte-dock": {
     "description": "Replacement dock for Plasma desktops, providing an elegant and intuitive experience for your tasks and plasmoids",
     "name": "latte-dock",
-    "project_path": "extragear/base/latte-dock",
+    "project_path": "base/latte-dock",
     "repo_path": "plasma/latte-dock"
   },
   "layer-shell-qt": {
     "description": "Qt component to allow applications to make use of the Wayland wl-layer-shell protocol.",
     "name": "layer-shell-qt",
-    "project_path": "kde/workspace/layer-shell-qt",
+    "project_path": "workspace/layer-shell-qt",
     "repo_path": "plasma/layer-shell-qt"
   },
   "libbluedevil": {
@@ -4388,7 +4406,7 @@
   "libdebconf-kde": {
     "description": "A library that talks debconf protocol used to present questions",
     "name": "libdebconf-kde",
-    "project_path": "extragear/sysadmin/libdebconf-kde",
+    "project_path": "sysadmin/libdebconf-kde",
     "repo_path": "system/libdebconf-kde"
   },
   "libechonest": {
@@ -4406,19 +4424,19 @@
   "libgravatar": {
     "description": "Library that provides Gravatar support",
     "name": "libgravatar",
-    "project_path": "kde/pim/libgravatar",
+    "project_path": "pim/libgravatar",
     "repo_path": "pim/libgravatar"
   },
   "libkcddb": {
     "description": "Library used to retrieve audio CD metadata from the Internet",
     "name": "libkcddb",
-    "project_path": "kde/kdemultimedia/libkcddb",
+    "project_path": "kdemultimedia/libkcddb",
     "repo_path": "multimedia/libkcddb"
   },
   "libkcompactdisc": {
     "description": "Library for interfacing with CDs",
     "name": "libkcompactdisc",
-    "project_path": "kde/kdemultimedia/libkcompactdisc",
+    "project_path": "kdemultimedia/libkcompactdisc",
     "repo_path": "multimedia/libkcompactdisc"
   },
   "libkcw": {
@@ -4430,7 +4448,7 @@
   "libkdcraw": {
     "description": "C++ interface around LibRaw library used to decode RAW picture files",
     "name": "libkdcraw",
-    "project_path": "kde/kdegraphics/libs/libkdcraw",
+    "project_path": "kdegraphics/libs/libkdcraw",
     "repo_path": "graphics/libkdcraw"
   },
   "libkdeedu": {
@@ -4442,25 +4460,25 @@
   "libkdegames": {
     "description": "Common code and data for many KDE games",
     "name": "libkdegames",
-    "project_path": "kde/kdegames/libkdegames",
+    "project_path": "kdegames/libkdegames",
     "repo_path": "games/libkdegames"
   },
   "libkdepim": {
     "description": "Library for common KDE PIM applications",
     "name": "libkdepim",
-    "project_path": "kde/pim/libkdepim",
+    "project_path": "pim/libkdepim",
     "repo_path": "pim/libkdepim"
   },
   "libkeduvocdocument": {
     "description": "Library to parse, convert, and manipulate KVTML files",
     "name": "libkeduvocdocument",
-    "project_path": "kde/kdeedu/libkeduvocdocument",
+    "project_path": "kdeedu/libkeduvocdocument",
     "repo_path": "education/libkeduvocdocument"
   },
   "libkexiv2": {
     "description": "Wrapper around Exiv2 library to manipulate picture metadata as EXIF and XMP",
     "name": "libkexiv2",
-    "project_path": "kde/kdegraphics/libs/libkexiv2",
+    "project_path": "kdegraphics/libs/libkexiv2",
     "repo_path": "graphics/libkexiv2"
   },
   "libkface": {
@@ -4478,43 +4496,43 @@
   "libkgapi": {
     "description": "Library for accessing various Google services via their public API",
     "name": "libkgapi",
-    "project_path": "kde/pim/libkgapi",
+    "project_path": "pim/libkgapi",
     "repo_path": "pim/libkgapi"
   },
   "libkgeomap": {
     "description": "Wrapper around different world-map components to browse and arrange photos over a map",
     "name": "libkgeomap",
-    "project_path": "kde/kdegraphics/libs/libkgeomap",
+    "project_path": "kdegraphics/libs/libkgeomap",
     "repo_path": "graphics/libkgeomap"
   },
   "libkimageannotator": {
     "description": "Utility for annotating images",
     "name": "libkimageannotator",
-    "project_path": "playground/libs/libkimageannotator",
+    "project_path": "libs/libkimageannotator",
     "repo_path": "libraries/libkimageannotator"
   },
   "libkipi": {
     "description": "Qt/C++ interface to use kipi-plugins from KDE image management programs",
     "name": "libkipi",
-    "project_path": "kde/kdegraphics/libs/libkipi",
+    "project_path": "kdegraphics/libs/libkipi",
     "repo_path": "graphics/libkipi"
   },
   "libkleo": {
     "description": "Library that provides cryptography support for mails",
     "name": "libkleo",
-    "project_path": "kde/pim/libkleo",
+    "project_path": "pim/libkleo",
     "repo_path": "pim/libkleo"
   },
   "libkmahjongg": {
     "description": "Common code, backgrounds and tile sets for games using Mahjongg tiles",
     "name": "libkmahjongg",
-    "project_path": "kde/kdegames/libkmahjongg",
+    "project_path": "kdegames/libkmahjongg",
     "repo_path": "games/libkmahjongg"
   },
   "libkomparediff2": {
     "description": "Library to compare files and strings, used in Kompare and KDevelop",
     "name": "libkomparediff2",
-    "project_path": "kde/kdesdk/libkomparediff2",
+    "project_path": "kdesdk/libkomparediff2",
     "repo_path": "sdk/libkomparediff2"
   },
   "libkoralle": {
@@ -4526,47 +4544,47 @@
   "libksane": {
     "description": "Library providing QWidget with all the logic to interface scanners",
     "name": "libksane",
-    "project_path": "kde/kdegraphics/libs/libksane",
+    "project_path": "kdegraphics/libs/libksane",
     "repo_path": "graphics/libksane"
   },
   "libkscreen": {
     "description": "KDE's screen management software",
     "name": "libkscreen",
-    "project_path": "kde/workspace/libkscreen",
+    "project_path": "workspace/libkscreen",
     "repo_path": "plasma/libkscreen"
   },
   "libksieve": {
     "description": "Library which manages Sieve support",
     "name": "libksieve",
-    "project_path": "kde/pim/libksieve",
+    "project_path": "pim/libksieve",
     "repo_path": "pim/libksieve"
   },
   "libksysguard": {
     "description": "Library to retrieve information on the current status of computer hardware",
     "name": "libksysguard",
-    "project_path": "kde/workspace/libksysguard",
+    "project_path": "workspace/libksysguard",
     "repo_path": "plasma/libksysguard"
   },
   "libktorrent": {
     "description": "BitTorrent protocol implementation",
     "name": "libktorrent",
-    "project_path": "kde/kdenetwork/libktorrent",
+    "project_path": "kdenetwork/libktorrent",
     "repo_path": "network/libktorrent"
   },
   "libkubuntu": {
     "description": "Library for Kubuntu platform integration",
     "name": "libkubuntu",
-    "project_path": "playground/base/libkubuntu",
+    "project_path": "base/libkubuntu",
     "repo_path": "libraries/libkubuntu"
   },
   "libkvkontakte": {
     "description": "C++/KF5 library for asynchronous interaction with VK social network web API",
     "name": "libkvkontakte",
-    "project_path": "extragear/libs/libkvkontakte",
+    "project_path": "libs/libkvkontakte",
     "repo_path": "libraries/libkvkontakte"
   },
   "liblikeback": {
-    "description": "A library that allows users to easily give feedback on software\nby embedding itself into every window and providing straight forward dialogs to\nexpress like or dislike of something.",
+    "description": "A library that allows users to easily give feedback on software by embedding itself into every window and providing straight forward dialogs to express like or dislike of something",
     "name": "liblikeback",
     "project_path": "unmaintained/liblikeback",
     "repo_path": "unmaintained/liblikeback"
@@ -4574,31 +4592,31 @@
   "libmediawiki": {
     "description": "C++ interface for MediaWiki-based web services such as Wikipedia",
     "name": "libmediawiki",
-    "project_path": "extragear/libs/libmediawiki",
+    "project_path": "libs/libmediawiki",
     "repo_path": "libraries/libmediawiki"
   },
   "libplasma": {
     "description": "Plasma library and runtime components",
     "name": "libplasma",
-    "project_path": "kde/workspace/libplasma",
+    "project_path": "workspace/libplasma",
     "repo_path": "plasma/libplasma"
   },
   "libqaccessibilityclient": {
     "description": "Accessibilty tools helper library, used e.g. by screen readers",
     "name": "libqaccessibilityclient",
-    "project_path": "extragear/libs/libqaccessibilityclient",
+    "project_path": "libs/libqaccessibilityclient",
     "repo_path": "libraries/libqaccessibilityclient"
   },
   "libqapt": {
     "description": "A Qt wrapper library/APT implementation around the libapt-pkg library",
     "name": "libqapt",
-    "project_path": "extragear/sysadmin/libqapt",
+    "project_path": "sysadmin/libqapt",
     "repo_path": "system/libqapt"
   },
   "libqgit2": {
     "description": "Qt wrapper library around the libgit2 git access library",
     "name": "libqgit2",
-    "project_path": "playground/libs/libqgit2",
+    "project_path": "libs/libqgit2",
     "repo_path": "libraries/libqgit2"
   },
   "libqinfinity": {
@@ -4610,13 +4628,13 @@
   "libqmycroft": {
     "description": "Mycroft integration library using a mock api to integrate apps as skill in mycroft",
     "name": "libqmycroft",
-    "project_path": "playground/libs/libqmycroft",
+    "project_path": "libs/libqmycroft",
     "repo_path": "libraries/libqmycroft"
   },
   "libqsystemd": {
     "description": "Simple Qt systemd interface library",
     "name": "libqsystemd",
-    "project_path": "playground/libs/libqsystemd",
+    "project_path": "libs/libqsystemd",
     "repo_path": "libraries/libqsystemd"
   },
   "libquotient": {
@@ -4652,289 +4670,289 @@
   "libtmdbqt": {
     "description": "Library that can retrieve information about movies from the TMDb web service",
     "name": "libtmdbqt",
-    "project_path": "playground/network/libtmdbqt",
+    "project_path": "network/libtmdbqt",
     "repo_path": "libraries/libtmdbqt"
   },
   "licensedigger": {
     "description": "Tools to convert existing license headers to SPDX compliant headers",
     "name": "licensedigger",
-    "project_path": "playground/sdk/licensedigger",
+    "project_path": "sdk/licensedigger",
     "repo_path": "sdk/licensedigger"
   },
   "licentia": {
     "description": "Choose a license for your project",
     "name": "licentia",
-    "project_path": "kdereview/licentia",
+    "project_path": "licentia",
     "repo_path": "sdk/licentia"
   },
   "lightdm-kde-greeter": {
-    "description": "Login screen using the LightDM framework.\n \n* \"LightDM project\":https://launchpad.net/lightdm\n* \"Bug Tracker\":https://bugs.kde.org/describecomponents.cgi?product=lightdm",
+    "description": "Login screen using the LightDM framework",
     "name": "lightdm-kde-greeter",
-    "project_path": "playground/base/lightdm-kde-greeter",
+    "project_path": "base/lightdm-kde-greeter",
     "repo_path": "plasma/lightdm-kde-greeter"
   },
   "liquidshell": {
     "description": "Basic desktop shell using QtWidgets",
     "name": "liquidshell",
-    "project_path": "extragear/base/liquidshell",
+    "project_path": "base/liquidshell",
     "repo_path": "system/liquidshell"
   },
   "lokalize": {
     "description": "Computer-aided translation",
     "name": "lokalize",
-    "project_path": "kde/kdesdk/lokalize",
+    "project_path": "kdesdk/lokalize",
     "repo_path": "sdk/lokalize"
   },
   "lskat": {
     "description": "Lieutenant Skat (from German Offiziersskat) is a fun and engaging card game for two players",
     "name": "lskat",
-    "project_path": "kde/kdegames/lskat",
+    "project_path": "kdegames/lskat",
     "repo_path": "games/lskat"
   },
   "macports-kde": {
     "description": "Macports Tree for KDE Software",
     "name": "macports-kde",
-    "project_path": "playground/sdk/macports-kde",
+    "project_path": "sdk/macports-kde",
     "repo_path": "unmaintained/macports-kde"
   },
   "mailcommon": {
     "description": "Library which provides support for mail applications",
     "name": "mailcommon",
-    "project_path": "kde/pim/mailcommon",
+    "project_path": "pim/mailcommon",
     "repo_path": "pim/mailcommon"
   },
   "mailimporter": {
     "description": "Library that implements importing of emails from various other email clients",
     "name": "mailimporter",
-    "project_path": "kde/pim/mailimporter",
+    "project_path": "pim/mailimporter",
     "repo_path": "pim/mailimporter"
   },
   "mangonel": {
     "description": "Simple and pretty application launcher",
     "name": "mangonel",
-    "project_path": "extragear/base/mangonel",
+    "project_path": "base/mangonel",
     "repo_path": "utilities/mangonel"
   },
   "marble": {
     "description": "Virtual Globe and World Atlas that you can use to learn more about the Earth",
     "name": "marble",
-    "project_path": "kde/kdeedu/marble",
+    "project_path": "kdeedu/marble",
     "repo_path": "education/marble"
   },
   "mark": {
     "description": "Scientific tool for data annotation",
     "name": "mark",
-    "project_path": "playground/base/mark",
+    "project_path": "base/mark",
     "repo_path": "education/mark"
   },
   "markdownpart": {
     "description": "KPart for rendering Markdown content",
     "name": "markdownpart",
-    "project_path": "kde/kdeutils/markdownpart",
+    "project_path": "kdeutils/markdownpart",
     "repo_path": "utilities/markdownpart"
   },
   "marknote": {
     "description": "A simple markdown note management app",
     "name": "marknote",
-    "project_path": "extragear/office/marknote",
+    "project_path": "office/marknote",
     "repo_path": "office/marknote"
   },
   "massif-visualizer": {
     "description": "Visualizer for Valgrind Massif data files",
     "name": "massif-visualizer",
-    "project_path": "extragear/sdk/massif-visualizer",
+    "project_path": "sdk/massif-visualizer",
     "repo_path": "sdk/massif-visualizer"
   },
   "maui-accounts-dbus-daemon": {
-    "description": "",
+    "description": "Accounts DBus Daemon for Maui",
     "name": "maui-accounts-dbus-daemon",
-    "project_path": "playground/base/maui-accounts-dbus-daemon",
+    "project_path": "base/maui-accounts-dbus-daemon",
     "repo_path": "maui/maui-accounts-dbus-daemon"
   },
   "maui-accounts-gui": {
-    "description": "",
+    "description": "Android Integration for Maui",
     "name": "maui-accounts-gui",
-    "project_path": "playground/base/maui-accounts-gui",
+    "project_path": "base/maui-accounts-gui",
     "repo_path": "maui/maui-accounts-gui"
   },
   "maui-agenda": {
     "description": "Maui Calendar App",
     "name": "maui-agenda",
-    "project_path": "playground/base/maui-agenda",
+    "project_path": "base/maui-agenda",
     "repo_path": "maui/maui-agenda"
   },
   "maui-booth": {
     "description": "A convergent camera app",
     "name": "maui-booth",
-    "project_path": "playground/base/maui-booth",
+    "project_path": "base/maui-booth",
     "repo_path": "maui/maui-booth"
   },
   "maui-clip": {
     "description": "Video player and video collection manager",
     "name": "maui-clip",
-    "project_path": "playground/base/maui-clip",
+    "project_path": "base/maui-clip",
     "repo_path": "maui/maui-clip"
   },
   "maui-communicator": {
     "description": "Contacts and dialer application",
     "name": "maui-communicator",
-    "project_path": "playground/base/maui-communicator",
+    "project_path": "base/maui-communicator",
     "repo_path": "maui/maui-communicator"
   },
   "maui-era": {
     "description": "Maui Clock app",
     "name": "maui-era",
-    "project_path": "playground/base/maui-era",
+    "project_path": "base/maui-era",
     "repo_path": "maui/maui-era"
   },
   "maui-fiery": {
     "description": "A convergent web browser",
     "name": "maui-fiery",
-    "project_path": "playground/base/maui-fiery",
+    "project_path": "base/maui-fiery",
     "repo_path": "maui/maui-fiery"
   },
   "maui-libdavclient": {
     "description": "DAV protocol support for Maui applications",
     "name": "maui-libdavclient",
-    "project_path": "playground/base/maui-libdavclient",
+    "project_path": "base/maui-libdavclient",
     "repo_path": "maui/maui-libdavclient"
   },
   "maui-pix": {
     "description": "Image gallery application",
     "name": "maui-pix",
-    "project_path": "playground/base/maui-pix",
+    "project_path": "base/maui-pix",
     "repo_path": "maui/maui-pix"
   },
   "maui-shelf": {
     "description": "Document and EBook collection manager",
     "name": "maui-shelf",
-    "project_path": "playground/base/maui-shelf",
+    "project_path": "base/maui-shelf",
     "repo_path": "maui/maui-shelf"
   },
   "maui-station": {
     "description": "Convergent terminal emulator",
     "name": "maui-station",
-    "project_path": "playground/base/maui-station",
+    "project_path": "base/maui-station",
     "repo_path": "maui/maui-station"
   },
   "maui-strike": {
     "description": "Strike is a simple minimal IDE for the Linux phones. Code, build, and run from the phone.",
     "name": "maui-strike",
-    "project_path": "playground/sdk/maui-strike",
+    "project_path": "sdk/maui-strike",
     "repo_path": "maui/maui-strike"
   },
   "mauikit": {
     "description": "Templated convergent controls and multi-platform utilities for Maui applications",
     "name": "mauikit",
-    "project_path": "playground/libs/mauikit",
+    "project_path": "libs/mauikit",
     "repo_path": "maui/mauikit"
   },
   "mauikit-accounts": {
     "description": "MauiKit utilities to handle User Accounts",
     "name": "mauikit-accounts",
-    "project_path": "playground/libs/mauikit-accounts",
+    "project_path": "libs/mauikit-accounts",
     "repo_path": "maui/mauikit-accounts"
   },
   "mauikit-archiver": {
     "description": "tQuick plugin for online archived/compressed files management",
     "name": "mauikit-archiver",
-    "project_path": "playground/base/mauikit-archiver",
+    "project_path": "base/mauikit-archiver",
     "repo_path": "maui/mauikit-archiver"
   },
   "mauikit-calendar": {
     "description": "Calendar support components for Maui applications",
     "name": "mauikit-calendar",
-    "project_path": "playground/base/mauikit-calendar",
+    "project_path": "base/mauikit-calendar",
     "repo_path": "maui/mauikit-calendar"
   },
   "mauikit-documents": {
     "description": "MauiKit QtQuick plugins for text editing",
     "name": "mauikit-documents",
-    "project_path": "playground/base/mauikit-documents",
+    "project_path": "base/mauikit-documents",
     "repo_path": "maui/mauikit-documents"
   },
   "mauikit-filebrowsing": {
     "description": "MauiKit File Browsing utilities and controls",
     "name": "mauikit-filebrowsing",
-    "project_path": "playground/libs/mauikit-filebrowsing",
+    "project_path": "libs/mauikit-filebrowsing",
     "repo_path": "maui/mauikit-filebrowsing"
   },
   "mauikit-git": {
     "description": "Git support components for Maui applications",
     "name": "mauikit-git",
-    "project_path": "playground/base/mauikit-git",
+    "project_path": "base/mauikit-git",
     "repo_path": "maui/mauikit-git"
   },
   "mauikit-imagetools": {
     "description": "MauiKit Image Tools Components",
     "name": "mauikit-imagetools",
-    "project_path": "playground/libs/mauikit-imagetools",
+    "project_path": "libs/mauikit-imagetools",
     "repo_path": "maui/mauikit-imagetools"
   },
   "mauikit-sdk": {
     "description": "SDK for Maui applications",
     "name": "mauikit-sdk",
-    "project_path": "playground/base/mauikit-sdk",
+    "project_path": "base/mauikit-sdk",
     "repo_path": "maui/mauikit-sdk"
   },
   "mauikit-terminal": {
     "description": "Terminal support components for Maui applications",
     "name": "mauikit-terminal",
-    "project_path": "playground/base/mauikit-terminal",
+    "project_path": "base/mauikit-terminal",
     "repo_path": "maui/mauikit-terminal"
   },
   "mauikit-texteditor": {
     "description": "MauiKit Text Editor components",
     "name": "mauikit-texteditor",
-    "project_path": "playground/libs/mauikit-texteditor",
+    "project_path": "libs/mauikit-texteditor",
     "repo_path": "maui/mauikit-texteditor"
   },
   "mauiman": {
     "description": "Maui Manager Library. Server and public library API.",
     "name": "mauiman",
-    "project_path": "playground/base/mauiman",
+    "project_path": "base/mauiman",
     "repo_path": "maui/mauiman"
   },
   "mbox-importer": {
     "description": "Wizard to assist with importing MBox email archives into Akonadi",
     "name": "mbox-importer",
-    "project_path": "kde/pim/mbox-importer",
+    "project_path": "pim/mbox-importer",
     "repo_path": "pim/mbox-importer"
   },
   "md4qt": {
     "description": "Header-only C++ library for parsing Markdown.",
     "name": "md4qt",
-    "project_path": "playground/libs/md4qt",
+    "project_path": "libs/md4qt",
     "repo_path": "libraries/md4qt"
   },
   "melon": {
     "description": "Desktop QML file manager",
     "name": "melon",
-    "project_path": "playground/system/melon",
+    "project_path": "system/melon",
     "repo_path": "system/melon"
   },
   "merkuro": {
     "description": "Merkuro is a application suite designed to make handling your emails, calendars, contacts, and tasks simple.",
     "name": "merkuro",
-    "project_path": "kde/pim/merkuro",
+    "project_path": "pim/merkuro",
     "repo_path": "pim/merkuro"
   },
   "messagelib": {
     "description": "Library components for messages (e.g. displaying Akonadi collections)",
     "name": "messagelib",
-    "project_path": "kde/pim/messagelib",
+    "project_path": "pim/messagelib",
     "repo_path": "pim/messagelib"
   },
   "milou": {
     "description": "A dedicated search application built on top of Baloo",
     "name": "milou",
-    "project_path": "kde/workspace/milou",
+    "project_path": "workspace/milou",
     "repo_path": "plasma/milou"
   },
   "mimetreeparser": {
     "description": "Parser for MIME trees",
     "name": "mimetreeparser",
-    "project_path": "kde/pim/mimetreeparser",
+    "project_path": "pim/mimetreeparser",
     "repo_path": "pim/mimetreeparser"
   },
   "ministro": {
@@ -4946,11 +4964,11 @@
   "minuet": {
     "description": "Free and open-source software for music education",
     "name": "minuet",
-    "project_path": "kde/kdeedu/minuet",
+    "project_path": "kdeedu/minuet",
     "repo_path": "education/minuet"
   },
   "modemmanager-qt": {
-    "description": "Qt wrapper for ModemManager DBus API.\n\nReport bugs in bugs.kde.org, under product frameworks-modemmanager-qt.",
+    "description": "Qt wrapper for ModemManager DBus API",
     "name": "modemmanager-qt",
     "project_path": "frameworks/modemmanager-qt",
     "repo_path": "frameworks/modemmanager-qt"
@@ -4964,7 +4982,7 @@
   "mpvqt": {
     "description": "MpvQt is a libmpv wrapper for QtQuick2 and QML",
     "name": "mpvqt",
-    "project_path": "kde/applications/mpvqt",
+    "project_path": "applications/mpvqt",
     "repo_path": "libraries/mpvqt"
   },
   "mrdanga-player": {
@@ -4976,7 +4994,7 @@
   "mtp-server": {
     "description": "MTP server allowing file access to Plasma Mobile devices",
     "name": "mtp-server",
-    "project_path": "playground/mobile/mtp-server",
+    "project_path": "mobile/mtp-server",
     "repo_path": "plasma-mobile/mtp-server"
   },
   "mula": {
@@ -4988,43 +5006,43 @@
   "muon": {
     "description": "A collection of package management tools for Debian-based systems",
     "name": "muon",
-    "project_path": "extragear/sysadmin/muon",
+    "project_path": "sysadmin/muon",
     "repo_path": "system/muon"
   },
   "mycroft-bigscreen-setup": {
     "description": "Bigscreen first boot mycroft configuration and setup skill",
     "name": "mycroft-bigscreen-setup",
-    "project_path": "playground/utils/mycroft-bigscreen-setup",
+    "project_path": "utils/mycroft-bigscreen-setup",
     "repo_path": "plasma-bigscreen/mycroft-bigscreen-setup"
   },
   "mycroft-gui": {
     "description": "The Graphical User Interface used by the Mycroft Mark II and more",
     "name": "mycroft-gui",
-    "project_path": "playground/system/mycroft-gui",
+    "project_path": "system/mycroft-gui",
     "repo_path": "system/mycroft-gui"
   },
   "mycroft-plasmoid": {
     "description": "Plasma integration of different Mycroft AI services",
     "name": "mycroft-plasmoid",
-    "project_path": "extragear/utils/mycroft-plasmoid",
+    "project_path": "utils/mycroft-plasmoid",
     "repo_path": "utilities/mycroft-plasmoid"
   },
   "mycroft-plasmoid-mobile": {
     "description": "Plasma Mobile integration of different Mycroft AI services",
     "name": "mycroft-plasmoid-mobile",
-    "project_path": "playground/utils/mycroft-plasmoid-mobile",
+    "project_path": "utils/mycroft-plasmoid-mobile",
     "repo_path": "plasma-mobile/mycroft-plasmoid-mobile"
   },
   "mycroft-ptt-client": {
     "description": "A simple push to talk client for mycroft based on libinput for USB remotes or external devices that wish to activate the mycroft listener with a button press for Plasma Bigscreen",
     "name": "mycroft-ptt-client",
-    "project_path": "playground/utils/mycroft-ptt-client",
+    "project_path": "utils/mycroft-ptt-client",
     "repo_path": "plasma-bigscreen/mycroft-ptt-client"
   },
   "mycroft-skill-installer": {
     "description": "Voice applications and mycroft skills installer for plasma bigscreen",
     "name": "mycroft-skill-installer",
-    "project_path": "playground/utils/mycroft-skill-installer",
+    "project_path": "utils/mycroft-skill-installer",
     "repo_path": "plasma-bigscreen/mycroft-skill-installer"
   },
   "necessitas-installer-framework": {
@@ -5042,23 +5060,23 @@
   "neochat": {
     "description": "A client for matrix, the decentralized communication protocol",
     "name": "neochat",
-    "project_path": "extragear/network/neochat",
+    "project_path": "network/neochat",
     "repo_path": "network/neochat"
   },
   "neon-docker-images": {
-    "description": "",
+    "description": "Docker packaging environment for KDE Neon",
     "name": "neon-docker-images",
     "project_path": "neon/docker-images",
     "repo_path": "neon/docker-images"
   },
   "neon-neon-repositories": {
-    "description": "",
+    "description": "Repositories for Neon",
     "name": "neon-neon-repositories",
     "project_path": "neon/neon/repositories",
     "repo_path": "neon/neon/repositories"
   },
   "nepomuk-core": {
-    "description": "The core Nepomuk system contains of the central services like file indexing, file system monitoring, query, and of course storage, as well as the corresponding client libraries.\n\nThis is a compile time dependency for kde-runtime.",
+    "description": "Core Nepomuk system components covering file indexing, file system monitoring, data querying and storage and corresponding client libraries",
     "name": "nepomuk-core",
     "project_path": "unmaintained/nepomuk-core",
     "repo_path": "unmaintained/nepomuk-core"
@@ -5076,7 +5094,7 @@
     "repo_path": "unmaintained/nepomuk-tools"
   },
   "nepomuk-web-extractor": {
-    "description": "Extract information for Nepomuk resources from various locations.\nMore information is available in following wiki pages: [[https://techbase.kde.org/Projects/Nepomuk/WebExtractor]]",
+    "description": "Extract information for Nepomuk resources from various locations",
     "name": "nepomuk-web-extractor",
     "project_path": "unmaintained/nepomuk-web-extractor",
     "repo_path": "unmaintained/nepomuk-web-extractor"
@@ -5106,7 +5124,7 @@
     "repo_path": "unmaintained/nepomukextras"
   },
   "nepomukshell": {
-    "description": "NepSaK - The Nepomuk Swiss Army Knife aka. NepomukShell is a maintenance and debugging tool intended for developers. \n\nIt allows to browse, query, and edit Nepomuk resources.",
+    "description": "Browse, query, and edit Nepomuk resources",
     "name": "nepomukshell",
     "project_path": "unmaintained/nepomukshell",
     "repo_path": "unmaintained/nepomukshell"
@@ -5124,27 +5142,27 @@
     "repo_path": "unmaintained/networkmanagement"
   },
   "networkmanager-qt": {
-    "description": "Qt wrapper for NetworkManager API.\n\nReport bugs in bugs.kde.org, under product frameworks-networkmanager-qt.",
+    "description": "Qt wrapper for NetworkManager API.",
     "name": "networkmanager-qt",
     "project_path": "frameworks/networkmanager-qt",
     "repo_path": "frameworks/networkmanager-qt"
   },
   "nomad-style": {
-    "description": "",
+    "description": "Nomad Qt Quick Controls 2 style",
     "name": "nomad-style",
-    "project_path": "playground/base/nomad-style",
+    "project_path": "base/nomad-style",
     "repo_path": "maui/nomad-style"
   },
   "nongurigaeru": {
     "description": "The missing Foundation library for Qt GUI apps.",
     "name": "nongurigaeru",
-    "project_path": "playground/libs/nongurigaeru",
+    "project_path": "libs/nongurigaeru",
     "repo_path": "libraries/nongurigaeru"
   },
   "nota": {
     "description": "Multi-platform text editor",
     "name": "nota",
-    "project_path": "playground/base/nota",
+    "project_path": "base/nota",
     "repo_path": "maui/nota"
   },
   "notably": {
@@ -5156,7 +5174,7 @@
   "notae": {
     "description": "A simple note taking application that automatically saves your work",
     "name": "notae",
-    "project_path": "playground/utils/notae",
+    "project_path": "utils/notae",
     "repo_path": "utilities/notae"
   },
   "notificationsurvey": {
@@ -5168,55 +5186,55 @@
   "ocean-sound-theme": {
     "description": "Ocean Sound Theme for Plasma",
     "name": "ocean-sound-theme",
-    "project_path": "kde/workspace/ocean-sound-theme",
+    "project_path": "workspace/ocean-sound-theme",
     "repo_path": "plasma/ocean-sound-theme"
   },
   "ocs-apiserver": {
     "description": "Backend API server for the software store",
     "name": "ocs-apiserver",
-    "project_path": "playground/www/ocs-apiserver",
+    "project_path": "www/ocs-apiserver",
     "repo_path": "webapps/ocs-apiserver"
   },
   "ocs-cdn": {
     "description": "Content delivery network for the software store",
     "name": "ocs-cdn",
-    "project_path": "playground/www/ocs-cdn",
+    "project_path": "www/ocs-cdn",
     "repo_path": "webapps/ocs-cdn"
   },
   "ocs-fileserver": {
     "description": "File server for the software store",
     "name": "ocs-fileserver",
-    "project_path": "playground/www/ocs-fileserver",
+    "project_path": "www/ocs-fileserver",
     "repo_path": "webapps/ocs-fileserver"
   },
   "ocs-server": {
     "description": "A web server which provides OCS (Open Collaboration Services) functionality, and a web demo client",
     "name": "ocs-server",
-    "project_path": "playground/www/ocs-server",
+    "project_path": "www/ocs-server",
     "repo_path": "webapps/ocs-server"
   },
   "ocs-webserver": {
     "description": "Webserver for running a software store",
     "name": "ocs-webserver",
-    "project_path": "playground/www/ocs-webserver",
+    "project_path": "www/ocs-webserver",
     "repo_path": "webapps/ocs-webserver"
   },
   "okteta": {
     "description": "Hex editor for viewing and editing the raw data of files",
     "name": "okteta",
-    "project_path": "extragear/utils/okteta",
+    "project_path": "utils/okteta",
     "repo_path": "utilities/okteta"
   },
   "okular": {
     "description": "KDE document viewer",
     "name": "okular",
-    "project_path": "kde/kdegraphics/okular",
+    "project_path": "kdegraphics/okular",
     "repo_path": "graphics/okular"
   },
   "optiimage": {
     "description": "Optimize your images with OptiImage, a useful image compressor that supports PNG, JPEG, WebP and SVG file types.",
     "name": "optiimage",
-    "project_path": "playground/graphics/optiimage",
+    "project_path": "graphics/optiimage",
     "repo_path": "graphics/optiimage"
   },
   "osx-patches": {
@@ -5228,7 +5246,7 @@
   "oxygen": {
     "description": "The Oxygen Style for Qt/KDE Applications",
     "name": "oxygen",
-    "project_path": "kde/workspace/oxygen",
+    "project_path": "workspace/oxygen",
     "repo_path": "plasma/oxygen"
   },
   "oxygen-fonts": {
@@ -5240,7 +5258,7 @@
   "oxygen-gtk": {
     "description": "Port of the Oxygen widget theme to GTK",
     "name": "oxygen-gtk",
-    "project_path": "playground/artwork/oxygen-gtk",
+    "project_path": "artwork/oxygen-gtk",
     "repo_path": "plasma/oxygen-gtk"
   },
   "oxygen-icons": {
@@ -5252,7 +5270,7 @@
   "oxygen-sounds": {
     "description": "The Oxygen Sound Theme",
     "name": "oxygen-sounds",
-    "project_path": "kde/workspace/oxygen-sounds",
+    "project_path": "workspace/oxygen-sounds",
     "repo_path": "plasma/oxygen-sounds"
   },
   "oxygen-transparent": {
@@ -5276,61 +5294,61 @@
   "palapeli": {
     "description": "Palapeli is a single-player jigsaw puzzle game",
     "name": "palapeli",
-    "project_path": "kde/kdegames/palapeli",
+    "project_path": "kdegames/palapeli",
     "repo_path": "games/palapeli"
   },
   "paleta": {
     "description": "Color utilities",
     "name": "paleta",
-    "project_path": "playground/base/paleta",
+    "project_path": "base/paleta",
     "repo_path": "maui/paleta"
   },
   "parley": {
     "description": "Vocabulary Trainer",
     "name": "parley",
-    "project_path": "kde/kdeedu/parley",
+    "project_path": "kdeedu/parley",
     "repo_path": "education/parley"
   },
   "partitionmanager": {
     "description": "Manage the disk devices, partitions and file systems on your computer",
     "name": "partitionmanager",
-    "project_path": "kde/kdeadmin/partitionmanager",
+    "project_path": "kdeadmin/partitionmanager",
     "repo_path": "system/partitionmanager"
   },
   "peertube-voice-application": {
     "description": "Peertube video player voice application and mycroft skill for Plasma Bigscreen",
     "name": "peertube-voice-application",
-    "project_path": "playground/utils/peertube-voice-application",
+    "project_path": "utils/peertube-voice-application",
     "repo_path": "plasma-bigscreen/peertube-voice-application"
   },
   "perceptualcolor": {
     "description": "Qt GUI components for choosing colors, with focus on an intuitive and perceptually uniform presentatio",
     "name": "perceptualcolor",
-    "project_path": "playground/libs/perceptualcolor",
+    "project_path": "libs/perceptualcolor",
     "repo_path": "libraries/perceptualcolor"
   },
   "perlkde": {
     "description": "Perl bindings for libraries created by the KDE community.",
     "name": "perlkde",
-    "project_path": "kde/kdebindings/perl/perlkde",
+    "project_path": "kdebindings/perl/perlkde",
     "repo_path": "unmaintained/perlkde"
   },
   "perlqt": {
     "description": "Perl bindings for the Qt libraries.",
     "name": "perlqt",
-    "project_path": "kde/kdebindings/perl/perlqt",
+    "project_path": "kdebindings/perl/perlqt",
     "repo_path": "unmaintained/perlqt"
   },
   "person-viewer": {
     "description": "Simple address book application displaying info about aggregated contacts",
     "name": "person-viewer",
-    "project_path": "playground/pim/person-viewer",
+    "project_path": "pim/person-viewer",
     "repo_path": "unmaintained/person-viewer"
   },
   "peruse": {
-    "description": "A comic book viewer and creator based on Frameworks 5, for use on multiple form factors",
+    "description": "A comic book viewer and creator",
     "name": "peruse",
-    "project_path": "extragear/graphics/peruse",
+    "project_path": "graphics/peruse",
     "repo_path": "graphics/peruse"
   },
   "phoneblocker": {
@@ -5402,31 +5420,31 @@
   "picmi": {
     "description": "A nonogram logic game by KDE",
     "name": "picmi",
-    "project_path": "kde/kdegames/picmi",
+    "project_path": "kdegames/picmi",
     "repo_path": "games/picmi"
   },
   "pico-wizard": {
     "description": "A Post Installation Configuration Wizard for Linux OSes",
     "name": "pico-wizard",
-    "project_path": "playground/base/pico-wizard",
+    "project_path": "base/pico-wizard",
     "repo_path": "plasma/pico-wizard"
   },
   "pikasso": {
     "description": "Simple drawing programs using Kirigami for the UI and Rust for the rendering.",
     "name": "pikasso",
-    "project_path": "playground/graphics/pikasso",
+    "project_path": "graphics/pikasso",
     "repo_path": "graphics/pikasso"
   },
   "pim-data-exporter": {
     "description": "Application to assist you with backing up and archiving of PIM data",
     "name": "pim-data-exporter",
-    "project_path": "kde/pim/pim-data-exporter",
+    "project_path": "pim/pim-data-exporter",
     "repo_path": "pim/pim-data-exporter"
   },
   "pim-sieve-editor": {
     "description": "Application to assist with editing IMAP Sieve filters",
     "name": "pim-sieve-editor",
-    "project_path": "kde/pim/pim-sieve-editor",
+    "project_path": "pim/pim-sieve-editor",
     "repo_path": "pim/pim-sieve-editor"
   },
   "pim-storage-service-manager": {
@@ -5438,19 +5456,19 @@
   "pim-technical-roadmap": {
     "description": "Project to track the PIM Technical Roadmap",
     "name": "pim-technical-roadmap",
-    "project_path": "playground/pim/pim-technical-roadmap",
+    "project_path": "pim/pim-technical-roadmap",
     "repo_path": "pim/pim-technical-roadmap"
   },
   "pimcommon": {
     "description": "Common library components for KDE PIM",
     "name": "pimcommon",
-    "project_path": "kde/pim/pimcommon",
+    "project_path": "pim/pimcommon",
     "repo_path": "pim/pimcommon"
   },
   "plank-player": {
     "description": "Multimedia Player for playing local files on Plasma Bigscreen allowing navigation with just a remote control",
     "name": "plank-player",
-    "project_path": "kde/workspace/plank-player",
+    "project_path": "workspace/plank-player",
     "repo_path": "plasma/plank-player"
   },
   "plasma-active-kickstart": {
@@ -5468,37 +5486,37 @@
   "plasma-active-window-control": {
     "description": "Active Window Control applet for the Plasma Desktop",
     "name": "plasma-active-window-control",
-    "project_path": "extragear/base/plasma-active-window-control",
+    "project_path": "base/plasma-active-window-control",
     "repo_path": "plasma/plasma-active-window-control"
   },
   "plasma-activities": {
     "description": "Core components for the KDE's Activities System",
     "name": "plasma-activities",
-    "project_path": "kde/workspace/plasma-activities",
+    "project_path": "workspace/plasma-activities",
     "repo_path": "plasma/plasma-activities"
   },
   "plasma-activities-stats": {
     "description": "A library for accessing the usage data collected by the activities system.",
     "name": "plasma-activities-stats",
-    "project_path": "kde/workspace/plasma-activities-stats",
+    "project_path": "workspace/plasma-activities-stats",
     "repo_path": "plasma/plasma-activities-stats"
   },
   "plasma-bigscreen": {
     "description": "Plasma shell for TVs",
     "name": "plasma-bigscreen",
-    "project_path": "kde/workspace/plasma-bigscreen",
+    "project_path": "workspace/plasma-bigscreen",
     "repo_path": "plasma/plasma-bigscreen"
   },
   "plasma-browser-integration": {
     "description": "Components necessary to integrate browsers into the Plasma Desktop",
     "name": "plasma-browser-integration",
-    "project_path": "kde/workspace/plasma-browser-integration",
+    "project_path": "workspace/plasma-browser-integration",
     "repo_path": "plasma/plasma-browser-integration"
   },
   "plasma-camera": {
     "description": "Camera application for Plasma Mobile",
     "name": "plasma-camera",
-    "project_path": "extragear/base/plasma-camera",
+    "project_path": "base/plasma-camera",
     "repo_path": "plasma-mobile/plasma-camera"
   },
   "plasma-crystal": {
@@ -5510,37 +5528,37 @@
   "plasma-desktop": {
     "description": "Plasma for the Desktop",
     "name": "plasma-desktop",
-    "project_path": "kde/workspace/plasma-desktop",
+    "project_path": "workspace/plasma-desktop",
     "repo_path": "plasma/plasma-desktop"
   },
   "plasma-dialer": {
     "description": "Dialer for Plasma Mobile",
     "name": "plasma-dialer",
-    "project_path": "extragear/mobile/plasma-dialer",
+    "project_path": "mobile/plasma-dialer",
     "repo_path": "plasma-mobile/plasma-dialer"
   },
   "plasma-disks": {
     "description": "Monitors S.M.A.R.T. capable devices for imminent failure.",
     "name": "plasma-disks",
-    "project_path": "kde/workspace/plasma-disks",
+    "project_path": "workspace/plasma-disks",
     "repo_path": "plasma/plasma-disks"
   },
   "plasma-firewall": {
     "description": "Control Panel for your system firewall",
     "name": "plasma-firewall",
-    "project_path": "kde/workspace/plasma-firewall",
+    "project_path": "workspace/plasma-firewall",
     "repo_path": "plasma/plasma-firewall"
   },
   "plasma-integration": {
     "description": "Qt Platform Theme integration plugins for Plasma Workspaces",
     "name": "plasma-integration",
-    "project_path": "kde/workspace/plasma-integration",
+    "project_path": "workspace/plasma-integration",
     "repo_path": "plasma/plasma-integration"
   },
   "plasma-keyboard": {
     "description": "Virtual Keyboard for Qt based desktops",
     "name": "plasma-keyboard",
-    "project_path": "playground/workspace/plasma-keyboard",
+    "project_path": "workspace/plasma-keyboard",
     "repo_path": "plasma/plasma-keyboard"
   },
   "plasma-lionmail": {
@@ -5549,16 +5567,22 @@
     "project_path": "unmaintained/plasma-lionmail",
     "repo_path": "unmaintained/plasma-lionmail"
   },
+  "plasma-login-manager": {
+    "description": "Plasma Login Manager",
+    "name": "plasma-login-manager",
+    "project_path": "workspace/plasma-login-manager",
+    "repo_path": "plasma/plasma-login-manager"
+  },
   "plasma-maliit-framework": {
     "description": "Framework for Maliit integration with Plasma",
     "name": "plasma-maliit-framework",
-    "project_path": "playground/mobile/plasma-maliit-framework",
+    "project_path": "mobile/plasma-maliit-framework",
     "repo_path": "plasma-mobile/plasma-maliit-framework"
   },
   "plasma-maliit-plugins": {
     "description": "Plasma integration for Maliit virtual keyboard",
     "name": "plasma-maliit-plugins",
-    "project_path": "playground/mobile/plasma-maliit-plugins",
+    "project_path": "mobile/plasma-maliit-plugins",
     "repo_path": "plasma-mobile/plasma-maliit-plugins"
   },
   "plasma-mediacenter": {
@@ -5570,13 +5594,13 @@
   "plasma-meetings": {
     "description": "Project to track the bi-weekly Plasma team meetings",
     "name": "plasma-meetings",
-    "project_path": "playground/workspace/plasma-meetings",
+    "project_path": "workspace/plasma-meetings",
     "repo_path": "plasma/plasma-meetings"
   },
   "plasma-mobile": {
     "description": "Plasma shell for mobile devices",
     "name": "plasma-mobile",
-    "project_path": "kde/workspace/plasma-mobile",
+    "project_path": "workspace/plasma-mobile",
     "repo_path": "plasma/plasma-mobile"
   },
   "plasma-mobile-config": {
@@ -5594,97 +5618,97 @@
   "plasma-mobile-history": {
     "description": "A complete Plasma workspace targeted from small handheld devices to larger tablets.",
     "name": "plasma-mobile-history",
-    "project_path": "extragear/base/plasma-mobile-history",
+    "project_path": "base/plasma-mobile-history",
     "repo_path": "unmaintained/plasma-mobile-history"
   },
   "plasma-mobile-sounds": {
     "description": "Sounds for Plasma Mobile devices",
     "name": "plasma-mobile-sounds",
-    "project_path": "playground/mobile/plasma-mobile-sounds",
+    "project_path": "mobile/plasma-mobile-sounds",
     "repo_path": "plasma-mobile/plasma-mobile-sounds"
   },
   "plasma-nano": {
     "description": "A minimal Plasma shell package",
     "name": "plasma-nano",
-    "project_path": "kde/workspace/plasma-nano",
+    "project_path": "workspace/plasma-nano",
     "repo_path": "plasma/plasma-nano"
   },
   "plasma-nm": {
     "description": "Plasma applet written in QML for managing network connections",
     "name": "plasma-nm",
-    "project_path": "kde/workspace/plasma-nm",
+    "project_path": "workspace/plasma-nm",
     "repo_path": "plasma/plasma-nm"
   },
   "plasma-pa": {
     "description": "Plasma applet for audio volume management using PulseAudio",
     "name": "plasma-pa",
-    "project_path": "kde/workspace/plasma-pa",
+    "project_path": "workspace/plasma-pa",
     "repo_path": "plasma/plasma-pa"
   },
   "plasma-packagekit": {
     "description": "Plasma applet to monitor Packagekit",
     "name": "plasma-packagekit",
-    "project_path": "playground/base/plasma-packagekit",
+    "project_path": "base/plasma-packagekit",
     "repo_path": "system/plasma-packagekit"
   },
   "plasma-pass": {
     "description": "Plasma applet for the Pass password manager",
     "name": "plasma-pass",
-    "project_path": "extragear/base/plasma-pass",
+    "project_path": "base/plasma-pass",
     "repo_path": "plasma/plasma-pass"
   },
   "plasma-phone-settings": {
     "description": "Configuration files for Plasma Mobile deployments",
     "name": "plasma-phone-settings",
-    "project_path": "playground/mobile/plasma-phone-settings",
+    "project_path": "mobile/plasma-phone-settings",
     "repo_path": "plasma-mobile/plasma-phone-settings"
   },
   "plasma-phonebook": {
     "description": "Phone book for Plasma Mobile",
     "name": "plasma-phonebook",
-    "project_path": "extragear/base/plasma-phonebook",
+    "project_path": "base/plasma-phonebook",
     "repo_path": "plasma-mobile/plasma-phonebook"
   },
   "plasma-pk-updates": {
     "description": "Plasma applet for software updates using PackageKit",
     "name": "plasma-pk-updates",
-    "project_path": "playground/base/plasma-pk-updates",
+    "project_path": "base/plasma-pk-updates",
     "repo_path": "system/plasma-pk-updates"
   },
   "plasma-redshift-control": {
     "description": "Redshift control applet for the Plasma Desktop",
     "name": "plasma-redshift-control",
-    "project_path": "extragear/base/plasma-redshift-control",
+    "project_path": "base/plasma-redshift-control",
     "repo_path": "plasma/plasma-redshift-control"
   },
   "plasma-remotecontrollers": {
     "description": "Translate various input device events into keyboard and pointer events",
     "name": "plasma-remotecontrollers",
-    "project_path": "kde/workspace/plasma-remotecontrollers",
+    "project_path": "workspace/plasma-remotecontrollers",
     "repo_path": "plasma-bigscreen/plasma-remotecontrollers"
   },
   "plasma-samegame": {
     "description": "Samegame clone suitable for mobile devices",
     "name": "plasma-samegame",
-    "project_path": "extragear/base/plasma-samegame",
+    "project_path": "base/plasma-samegame",
     "repo_path": "plasma-mobile/plasma-samegame"
   },
   "plasma-sdk": {
     "description": "Applications useful for Plasma development",
     "name": "plasma-sdk",
-    "project_path": "kde/workspace/plasma-sdk",
+    "project_path": "workspace/plasma-sdk",
     "repo_path": "plasma/plasma-sdk"
   },
   "plasma-settings": {
     "description": "Settings application for Plasma Mobile",
     "name": "plasma-settings",
-    "project_path": "extragear/base/plasma-settings",
+    "project_path": "base/plasma-settings",
     "repo_path": "plasma-mobile/plasma-settings"
   },
   "plasma-simplemenu": {
     "description": "Simplified menu for your Plasma Desktop",
     "name": "plasma-simplemenu",
-    "project_path": "extragear/base/plasma-simplemenu",
+    "project_path": "base/plasma-simplemenu",
     "repo_path": "plasma/plasma-simplemenu"
   },
   "plasma-systemd-integration": {
@@ -5696,25 +5720,25 @@
   "plasma-systemmonitor": {
     "description": "An interface for monitoring system sensors, process information and other system resources",
     "name": "plasma-systemmonitor",
-    "project_path": "kde/workspace/plasma-systemmonitor",
+    "project_path": "workspace/plasma-systemmonitor",
     "repo_path": "plasma/plasma-systemmonitor"
   },
   "plasma-tests": {
     "description": "Tests for the Plasma Workspace",
     "name": "plasma-tests",
-    "project_path": "kde/workspace/plasma-tests",
+    "project_path": "workspace/plasma-tests",
     "repo_path": "plasma/plasma-tests"
   },
   "plasma-thunderbolt": {
     "description": "Plasma integration for controlling Thunderbolt devices",
     "name": "plasma-thunderbolt",
-    "project_path": "kde/workspace/plasma-thunderbolt",
+    "project_path": "workspace/plasma-thunderbolt",
     "repo_path": "plasma/plasma-thunderbolt"
   },
   "plasma-vault": {
     "description": "Plasma applet and services for creating encrypted vaults",
     "name": "plasma-vault",
-    "project_path": "kde/workspace/plasma-vault",
+    "project_path": "workspace/plasma-vault",
     "repo_path": "plasma/plasma-vault"
   },
   "plasma-wallpaper-updater": {
@@ -5732,37 +5756,37 @@
   "plasma-welcome": {
     "description": "A friendly onboarding wizard for Plasma",
     "name": "plasma-welcome",
-    "project_path": "kde/workspace/plasma-welcome",
+    "project_path": "workspace/plasma-welcome",
     "repo_path": "plasma/plasma-welcome"
   },
   "plasma-workspace": {
     "description": "Various components needed to run a Plasma-based environment",
     "name": "plasma-workspace",
-    "project_path": "kde/workspace/plasma-workspace",
+    "project_path": "workspace/plasma-workspace",
     "repo_path": "plasma/plasma-workspace"
   },
   "plasma-workspace-wallpapers": {
     "description": "Wallpapers for Plasma Workspaces",
     "name": "plasma-workspace-wallpapers",
-    "project_path": "kde/workspace/plasma-workspace-wallpapers",
+    "project_path": "workspace/plasma-workspace-wallpapers",
     "repo_path": "plasma/plasma-workspace-wallpapers"
   },
   "plasma5support": {
     "description": "Support components for porting from KF5/Qt5 to KF6/Qt6",
     "name": "plasma5support",
-    "project_path": "kde/workspace/plasma5support",
+    "project_path": "workspace/plasma5support",
     "repo_path": "plasma/plasma5support"
   },
   "plasmate": {
     "description": "Plasma Applet Development Environment",
     "name": "plasmate",
-    "project_path": "playground/sdk/plasmate",
+    "project_path": "sdk/plasmate",
     "repo_path": "unmaintained/plasmate"
   },
   "plasmatube": {
     "description": "Kirigami YouTube video player based on QtMultimedia and youtube-dl",
     "name": "plasmatube",
-    "project_path": "playground/mobile/plasmatube",
+    "project_path": "mobile/plasmatube",
     "repo_path": "multimedia/plasmatube"
   },
   "plasmoid-eventlist": {
@@ -5774,31 +5798,31 @@
   "plymouth-kcm": {
     "description": "KCM to manage the Plymouth (Boot) theme",
     "name": "plymouth-kcm",
-    "project_path": "kde/workspace/plymouth-kcm",
+    "project_path": "workspace/plymouth-kcm",
     "repo_path": "plasma/plymouth-kcm"
   },
   "pokipoki": {
     "description": "Persistent object framework",
     "name": "pokipoki",
-    "project_path": "kdereview/pokipoki",
+    "project_path": "pokipoki",
     "repo_path": "libraries/pokipoki"
   },
   "polinpin": {
     "description": "Site for conducting tests",
     "name": "polinpin",
-    "project_path": "playground/www/polinpin",
+    "project_path": "www/polinpin",
     "repo_path": "webapps/polinpin"
   },
   "polkit-kde-agent-1": {
     "description": "Daemon providing a Polkit authentication UI for Plasma",
     "name": "polkit-kde-agent-1",
-    "project_path": "kde/workspace/polkit-kde-agent-1",
+    "project_path": "workspace/polkit-kde-agent-1",
     "repo_path": "plasma/polkit-kde-agent-1"
   },
   "polkit-kde-kcmodules-1": {
     "description": "Set of configuration modules which allows administrator to change polkit settings.",
     "name": "polkit-kde-kcmodules-1",
-    "project_path": "playground/system/polkit-kde-kcmodules-1",
+    "project_path": "system/polkit-kde-kcmodules-1",
     "repo_path": "system/polkit-kde-kcmodules-1"
   },
   "polkit-qt-1": {
@@ -5810,7 +5834,7 @@
   "pology": {
     "description": "Library and collection of tools for in-depth processing of PO files",
     "name": "pology",
-    "project_path": "playground/sdk/pology",
+    "project_path": "sdk/pology",
     "repo_path": "sdk/pology"
   },
   "poppler": {
@@ -5822,25 +5846,25 @@
   "powerdevil": {
     "description": "Manages the power consumption settings of a Plasma shell",
     "name": "powerdevil",
-    "project_path": "kde/workspace/powerdevil",
+    "project_path": "workspace/powerdevil",
     "repo_path": "plasma/powerdevil"
   },
   "powerplant": {
     "description": "An app to keep track of your plants' needs",
     "name": "powerplant",
-    "project_path": "playground/utils/powerplant",
+    "project_path": "utils/powerplant",
     "repo_path": "utilities/powerplant"
   },
   "poxml": {
     "description": "Translate DocBook XML files using gettext PO files",
     "name": "poxml",
-    "project_path": "kde/kdesdk/poxml",
+    "project_path": "kdesdk/poxml",
     "repo_path": "sdk/poxml"
   },
   "print-manager": {
     "description": "A tool for managing print jobs and printers",
     "name": "print-manager",
-    "project_path": "kde/workspace/print-manager",
+    "project_path": "workspace/print-manager",
     "repo_path": "plasma/print-manager"
   },
   "printer-applet": {
@@ -5870,7 +5894,7 @@
   "pulseaudio-qt": {
     "description": "Qt bindings for libpulse",
     "name": "pulseaudio-qt",
-    "project_path": "extragear/libs/pulseaudio-qt",
+    "project_path": "libs/pulseaudio-qt",
     "repo_path": "libraries/pulseaudio-qt"
   },
   "purpose": {
@@ -5882,19 +5906,19 @@
   "pvfviewer": {
     "description": "PC Stitch Pattern Viewer",
     "name": "pvfviewer",
-    "project_path": "extragear/graphics/pvfviewer",
+    "project_path": "graphics/pvfviewer",
     "repo_path": "graphics/pvfviewer"
   },
   "pykde4": {
     "description": "Python KDE bindings using PyQt4 SIP technology.",
     "name": "pykde4",
-    "project_path": "kde/kdebindings/python/pykde4",
+    "project_path": "kdebindings/python/pykde4",
     "repo_path": "unmaintained/pykde4"
   },
   "pykde5": {
     "description": "Python bindings for KF5",
     "name": "pykde5",
-    "project_path": "kde/kdebindings/python/pykde5",
+    "project_path": "kdebindings/python/pykde5",
     "repo_path": "libraries/pykde5"
   },
   "qca": {
@@ -5912,19 +5936,19 @@
   "qml-lsp": {
     "description": "Collection of QML tools, including qml-lsp, qml-dap, and qml-refactor-fairy",
     "name": "qml-lsp",
-    "project_path": "playground/sdk/qml-lsp",
+    "project_path": "sdk/qml-lsp",
     "repo_path": "sdk/qml-lsp"
   },
   "qmlkonsole": {
     "description": "Terminal app for Plasma Mobile",
     "name": "qmlkonsole",
-    "project_path": "playground/mobile/qmlkonsole",
+    "project_path": "mobile/qmlkonsole",
     "repo_path": "plasma-mobile/qmlkonsole"
   },
   "qmlonline": {
     "description": "Browser based QML Renderer",
     "name": "qmlonline",
-    "project_path": "playground/www/qmlonline",
+    "project_path": "www/qmlonline",
     "repo_path": "webapps/qmlonline"
   },
   "qmltermwidget": {
@@ -5942,7 +5966,7 @@
   "qqc2-breeze-style": {
     "description": "Breeze inspired QQC2 Style",
     "name": "qqc2-breeze-style",
-    "project_path": "kde/workspace/qqc2-breeze-style",
+    "project_path": "workspace/qqc2-breeze-style",
     "repo_path": "plasma/qqc2-breeze-style"
   },
   "qqc2-desktop-style": {
@@ -5954,7 +5978,7 @@
   "qrca": {
     "description": "QR code scanner for Plasma Mobile",
     "name": "qrca",
-    "project_path": "kdereview/utilities/qrca",
+    "project_path": "utilities/qrca",
     "repo_path": "utilities/qrca"
   },
   "qt1": {
@@ -5978,13 +6002,13 @@
   "qtcurve": {
     "description": "Style engine for Qt and other toolkits",
     "name": "qtcurve",
-    "project_path": "extragear/base/qtcurve",
+    "project_path": "base/qtcurve",
     "repo_path": "system/qtcurve"
   },
   "qtjolie": {
     "description": "Qt binding to use the Jolie service-oriented framework",
     "name": "qtjolie",
-    "project_path": "playground/libs/qtjolie",
+    "project_path": "libs/qtjolie",
     "repo_path": "libraries/qtjolie"
   },
   "qtkeychain": {
@@ -5996,49 +6020,49 @@
   "qtruby": {
     "description": "Ruby bindings for the Qt libraries.",
     "name": "qtruby",
-    "project_path": "kde/kdebindings/ruby/qtruby",
+    "project_path": "kdebindings/ruby/qtruby",
     "repo_path": "unmaintained/qtruby"
   },
   "quanta": {
     "description": "Quanta, an IDE for Web Development based on the KDevelop Platform.",
     "name": "quanta",
-    "project_path": "playground/devtools/quanta",
+    "project_path": "devtools/quanta",
     "repo_path": "unmaintained/quanta"
   },
   "qxmpp": {
     "description": "C++ XMPP client and server library",
     "name": "qxmpp",
-    "project_path": "playground/libs/qxmpp",
+    "project_path": "libs/qxmpp",
     "repo_path": "libraries/qxmpp"
   },
   "qyoto": {
     "description": ".NET/Mono bindings for the Qt libraries.",
     "name": "qyoto",
-    "project_path": "kde/kdebindings/csharp/qyoto",
+    "project_path": "kdebindings/csharp/qyoto",
     "repo_path": "unmaintained/qyoto"
   },
   "rattlesnake": {
     "description": "Rattlesnake is a metronome app for mobile and desktop.",
     "name": "rattlesnake",
-    "project_path": "playground/multimedia/rattlesnake",
+    "project_path": "multimedia/rattlesnake",
     "repo_path": "multimedia/rattlesnake"
   },
   "raven": {
     "description": "A mail client for Plasma Mobile",
     "name": "raven",
-    "project_path": "playground/mobile/raven",
+    "project_path": "mobile/raven",
     "repo_path": "plasma-mobile/raven"
   },
   "rcharactersheet": {
     "description": "Rolisteam Character Set Shared Components",
     "name": "rcharactersheet",
-    "project_path": "playground/games/rcharactersheet",
+    "project_path": "games/rcharactersheet",
     "repo_path": "rolisteam/rcharactersheet"
   },
   "rcse": {
     "description": "Character Set IDE for Rolisteam applications.",
     "name": "rcse",
-    "project_path": "playground/games/rcse",
+    "project_path": "games/rcse",
     "repo_path": "rolisteam/rcse"
   },
   "rekollect": {
@@ -6056,13 +6080,13 @@
   "release-buddy": {
     "description": "KDE Release and Packaging System",
     "name": "release-buddy",
-    "project_path": "playground/utils/release-buddy",
+    "project_path": "utils/release-buddy",
     "repo_path": "unmaintained/release-buddy"
   },
   "releaseme": {
     "description": "Release script framework",
     "name": "releaseme",
-    "project_path": "playground/sdk/releaseme",
+    "project_path": "sdk/releaseme",
     "repo_path": "sdk/releaseme"
   },
   "repo-management": {
@@ -6074,79 +6098,79 @@
   "ring-kde": {
     "description": "Qt-based Ring communication framework (www.ring.cx) client",
     "name": "ring-kde",
-    "project_path": "extragear/pim/ring-kde",
+    "project_path": "pim/ring-kde",
     "repo_path": "network/ring-kde"
   },
   "rkward": {
     "description": "Easily extensible and easy-to-use IDE/GUI for R",
     "name": "rkward",
-    "project_path": "extragear/education/rkward",
+    "project_path": "education/rkward",
     "repo_path": "education/rkward"
   },
   "rocs": {
     "description": "An educational Graph Theory IDE",
     "name": "rocs",
-    "project_path": "kde/kdeedu/rocs",
+    "project_path": "kdeedu/rocs",
     "repo_path": "education/rocs"
   },
   "rolisteam": {
     "description": "Virtual Tabletop Backend for Games",
     "name": "rolisteam",
-    "project_path": "playground/games/rolisteam",
+    "project_path": "games/rolisteam",
     "repo_path": "rolisteam/rolisteam"
   },
   "rolisteam-common": {
     "description": "Shared Components for Rolisteam",
     "name": "rolisteam-common",
-    "project_path": "playground/games/rolisteam-common",
+    "project_path": "games/rolisteam-common",
     "repo_path": "rolisteam/rolisteam-common"
   },
   "rolisteam-community-data": {
     "description": "Contributed Resources for Rolisteam Applications (Character Sheets, Themes, etc)",
     "name": "rolisteam-community-data",
-    "project_path": "playground/games/rolisteam-community-data",
+    "project_path": "games/rolisteam-community-data",
     "repo_path": "rolisteam/rolisteam-community-data"
   },
   "rolisteam-diceparser": {
     "description": "Rolisteam Dice Handling Components",
     "name": "rolisteam-diceparser",
-    "project_path": "playground/games/rolisteam-diceparser",
+    "project_path": "games/rolisteam-diceparser",
     "repo_path": "rolisteam/rolisteam-diceparser"
   },
   "rolisteam-packaging": {
     "description": "Packaging resources for Rolisteam (Windows, Mac, Docker image, Snap and Debian packages)",
     "name": "rolisteam-packaging",
-    "project_path": "playground/games/rolisteam-packaging",
+    "project_path": "games/rolisteam-packaging",
     "repo_path": "rolisteam/rolisteam-packaging"
   },
   "rolisteam-plugins": {
     "description": "Various Shared Plugins for Rolisteam",
     "name": "rolisteam-plugins",
-    "project_path": "playground/games/rolisteam-plugins",
+    "project_path": "games/rolisteam-plugins",
     "repo_path": "rolisteam/rolisteam-plugins"
   },
   "rsibreak": {
     "description": "Helps prevent Repetitive Strain Injury by reminding you to take a break",
     "name": "rsibreak",
-    "project_path": "extragear/utils/rsibreak",
+    "project_path": "utils/rsibreak",
     "repo_path": "utilities/rsibreak"
   },
   "ruqola": {
     "description": "KDE client for Rocket Chat",
     "name": "ruqola",
-    "project_path": "extragear/network/ruqola",
+    "project_path": "network/ruqola",
     "repo_path": "network/ruqola"
   },
   "rust-qt-binding-generator": {
     "description": "Generate bindings to use Rust code in Qt and QML",
     "name": "rust-qt-binding-generator",
-    "project_path": "extragear/sdk/rust-qt-binding-generator",
+    "project_path": "sdk/rust-qt-binding-generator",
     "repo_path": "sdk/rust-qt-binding-generator"
   },
   "samba-mounter": {
     "description": "Samba Share Mounter",
     "name": "samba-mounter",
-    "project_path": "playground/base/samba-mounter",
+    "project_path": "base/samba-mounter",
     "repo_path": "system/samba-mounter"
   },
   "scribo": {
@@ -6158,13 +6182,13 @@
   "sddm-kcm": {
     "description": "Configuration module for SDDM",
     "name": "sddm-kcm",
-    "project_path": "kde/workspace/sddm-kcm",
+    "project_path": "workspace/sddm-kcm",
     "repo_path": "plasma/sddm-kcm"
   },
   "selenium-webdriver-at-spi": {
     "description": "Selenium/Appium WebDriver implementation based on AT-SPI Accessibility",
     "name": "selenium-webdriver-at-spi",
-    "project_path": "playground/sdk/selenium-webdriver-at-spi",
+    "project_path": "sdk/selenium-webdriver-at-spi",
     "repo_path": "sdk/selenium-webdriver-at-spi"
   },
   "sflphone-kde": {
@@ -6182,7 +6206,7 @@
   "signon-kwallet-extension": {
     "description": "KWallet integration for the SignOn framework (gitlab.com/accounts-sso)",
     "name": "signon-kwallet-extension",
-    "project_path": "kde/kdenetwork/signon-kwallet-extension",
+    "project_path": "kdenetwork/signon-kwallet-extension",
     "repo_path": "network/signon-kwallet-extension"
   },
   "signond": {
@@ -6212,97 +6236,97 @@
   "sink": {
     "description": "Offline caching, synchronization and indexing system for PIM data",
     "name": "sink",
-    "project_path": "playground/pim/sink",
+    "project_path": "pim/sink",
     "repo_path": "pim/sink"
   },
   "skanlite": {
     "description": "Lite image scanning application",
     "name": "skanlite",
-    "project_path": "kde/kdegraphics/skanlite",
+    "project_path": "kdegraphics/skanlite",
     "repo_path": "graphics/skanlite"
   },
   "skanpage": {
     "description": "Utility to scan images and multi-page documents",
     "name": "skanpage",
-    "project_path": "kde/kdeutils/skanpage",
+    "project_path": "kdeutils/skanpage",
     "repo_path": "utilities/skanpage"
   },
   "skladnik": {
     "description": "Skladnik is the Japanese warehouse keeper sokoban game",
     "name": "skladnik",
-    "project_path": "extragear/games/skladnik",
+    "project_path": "games/skladnik",
     "repo_path": "games/skladnik"
   },
   "skrooge": {
     "description": "Personal finance manager that aims at being powerful and intuitive",
     "name": "skrooge",
-    "project_path": "extragear/office/skrooge",
+    "project_path": "office/skrooge",
     "repo_path": "office/skrooge"
   },
   "smaragd": {
     "description": "KWin plugin to support Emerald themes in KDE",
     "name": "smaragd",
-    "project_path": "playground/artwork/smaragd",
+    "project_path": "artwork/smaragd",
     "repo_path": "plasma/smaragd"
   },
   "smb4k": {
     "description": "Advanced network neighborhood browser and Samba share mounting utility",
     "name": "smb4k",
-    "project_path": "extragear/network/smb4k",
+    "project_path": "network/smb4k",
     "repo_path": "network/smb4k"
   },
   "smokegen": {
     "description": "A general purpose C++ parser with a plugin infrastructure enabling ''generators'' to be written, which can do various things with the C++ AST. It is currently used for generating the various SMOKE libraries.",
     "name": "smokegen",
-    "project_path": "kde/kdebindings/smoke/smokegen",
+    "project_path": "kdebindings/smoke/smokegen",
     "repo_path": "unmaintained/smokegen"
   },
   "smokekde": {
     "description": "SMOKE bindings for libraries created by the KDE community. Used by language bindings.",
     "name": "smokekde",
-    "project_path": "kde/kdebindings/smoke/smokekde",
+    "project_path": "kdebindings/smoke/smokekde",
     "repo_path": "unmaintained/smokekde"
   },
   "smokeqt": {
     "description": "SMOKE bindings for the Qt libraries. Used by language bindings.",
     "name": "smokeqt",
-    "project_path": "kde/kdebindings/smoke/smokeqt",
+    "project_path": "kdebindings/smoke/smokeqt",
     "repo_path": "unmaintained/smokeqt"
   },
   "snap-kcm": {
     "description": "KCM allowing changing permissions which have granted to installed Snap applications.",
     "name": "snap-kcm",
-    "project_path": "kdereview/snap-kcm",
+    "project_path": "snap-kcm",
     "repo_path": "plasma/snap-kcm"
   },
   "snap-kf5": {
     "description": "Content Snap for Qt5 and KF5",
     "name": "snap-kf5",
-    "project_path": "playground/packaging/snap-kf5",
+    "project_path": "packaging/snap-kf5",
     "repo_path": "packaging/snap-kf5"
   },
   "snap-kf5-launcher": {
     "description": "Launcher for Content Snap for Qt5 and KF5",
     "name": "snap-kf5-launcher",
-    "project_path": "playground/packaging/snap-kf5-launcher",
+    "project_path": "packaging/snap-kf5-launcher",
     "repo_path": "packaging/snap-kf5-launcher"
   },
   "snapcraft-kde-applications": {
     "description": "Snapcraft packaging files for some KDE Applications",
     "name": "snapcraft-kde-applications",
-    "project_path": "playground/packaging/snapcraft-kde-applications",
+    "project_path": "packaging/snapcraft-kde-applications",
     "repo_path": "packaging/snapcraft-kde-applications"
   },
   "snorenotify": {
     "description": "Multi-platform Qt notification framework",
     "name": "snorenotify",
-    "project_path": "playground/libs/snorenotify",
+    "project_path": "libs/snorenotify",
     "repo_path": "libraries/snorenotify"
   },
   "snoretoast": {
     "description": "Command-line application capable of creating Windows Toast notifications",
     "name": "snoretoast",
-    "project_path": "playground/libs/snoretoast",
+    "project_path": "libs/snoretoast",
     "repo_path": "libraries/snoretoast"
   },
   "solid": {
@@ -6332,19 +6356,19 @@
   "soundcloud-voice-application": {
     "description": "Soundcloud music player voice application and mycroft skill for Plasma Bigscreen",
     "name": "soundcloud-voice-application",
-    "project_path": "playground/utils/soundcloud-voice-application",
+    "project_path": "utils/soundcloud-voice-application",
     "repo_path": "plasma-bigscreen/soundcloud-voice-application"
   },
   "spacebar": {
     "description": "SMS/MMS application for Plasma Mobile",
     "name": "spacebar",
-    "project_path": "extragear/mobile/spacebar",
+    "project_path": "mobile/spacebar",
     "repo_path": "plasma-mobile/spacebar"
   },
   "spectacle": {
     "description": "Screenshot capture utility",
     "name": "spectacle",
-    "project_path": "kde/kdegraphics/spectacle",
+    "project_path": "kdegraphics/spectacle",
     "repo_path": "graphics/spectacle"
   },
   "sprinter": {
@@ -6374,19 +6398,19 @@
   "step": {
     "description": "Interactive physics simulator",
     "name": "step",
-    "project_path": "kde/kdeedu/step",
+    "project_path": "kdeedu/step",
     "repo_path": "education/step"
   },
   "stibium": {
     "description": "Stibium is a version of KDE developed as a web application, using personal cloud services to store data.",
     "name": "stibium",
-    "project_path": "playground/www/stibium",
+    "project_path": "www/stibium",
     "repo_path": "unmaintained/stibium"
   },
   "stopmotion": {
     "description": "Grab the frames of your animation!",
     "name": "stopmotion",
-    "project_path": "playground/multimedia/stopmotion",
+    "project_path": "multimedia/stopmotion",
     "repo_path": "multimedia/stopmotion"
   },
   "strigi": {
@@ -6422,7 +6446,7 @@
   "subtitlecomposer": {
     "description": "Video subtitle editor",
     "name": "subtitlecomposer",
-    "project_path": "kde/kdemultimedia/subtitlecomposer",
+    "project_path": "kdemultimedia/subtitlecomposer",
     "repo_path": "multimedia/subtitlecomposer"
   },
   "superbuild": {
@@ -6440,43 +6464,43 @@
   "svgmod": {
     "description": "Apply system colors to plasma rendered SVGs",
     "name": "svgmod",
-    "project_path": "playground/devtools/svgmod",
+    "project_path": "devtools/svgmod",
     "repo_path": "unmaintained/svgmod"
   },
   "svgpart": {
     "description": "A KPart for SVG support",
     "name": "svgpart",
-    "project_path": "kde/kdegraphics/svgpart",
+    "project_path": "kdegraphics/svgpart",
     "repo_path": "graphics/svgpart"
   },
   "sweeper": {
     "description": "Application that helps to clean unwanted traces the user leaves on the system",
     "name": "sweeper",
-    "project_path": "kde/kdeutils/sweeper",
+    "project_path": "kdeutils/sweeper",
     "repo_path": "utilities/sweeper"
   },
   "symboleditor": {
     "description": "Application to create libraries of QPainterPath objects with rendering hints",
     "name": "symboleditor",
-    "project_path": "extragear/graphics/symboleditor",
+    "project_path": "graphics/symboleditor",
     "repo_path": "graphics/symboleditor"
   },
   "symmy": {
     "description": "GPG symmetric encryption frontend",
     "name": "symmy",
-    "project_path": "extragear/utils/symmy",
+    "project_path": "utils/symmy",
     "repo_path": "utilities/symmy"
   },
   "synchrotron": {
     "description": "An OCS compatible web service for publishing application add-ons from upstream projects directly to users via a git repository.",
     "name": "synchrotron",
-    "project_path": "playground/www/synchrotron",
+    "project_path": "www/synchrotron",
     "repo_path": "unmaintained/synchrotron"
   },
   "synchrotron-sources": {
     "description": "An OCS compatible web service for publishing application add-ons from upstream projects directly to users via a git repository.",
     "name": "synchrotron-sources",
-    "project_path": "playground/www/synchrotron-sources",
+    "project_path": "www/synchrotron-sources",
     "repo_path": "unmaintained/synchrotron-sources"
   },
   "syndication": {
@@ -6498,13 +6522,13 @@
     "repo_path": "sysadmin/activityfilter"
   },
   "sysadmin-appimage-tooling": {
-    "description": "",
+    "description": "Appimage tooling for KDE applications",
     "name": "sysadmin-appimage-tooling",
     "project_path": "sysadmin/appimage-tooling",
     "repo_path": "sysadmin/appimage-tooling"
   },
   "sysadmin-appstream-metainfo-release-update": {
-    "description": "Updates AppStream Metainfo files for new releases of your software\r\n",
+    "description": "Updates AppStream Metainfo files for new releases of your software",
     "name": "sysadmin-appstream-metainfo-release-update",
     "project_path": "sysadmin/appstream-metainfo-release-update",
     "repo_path": "sysadmin/appstream-metainfo-release-update"
@@ -6516,7 +6540,7 @@
     "repo_path": "sysadmin/binary-factory-tooling"
   },
   "sysadmin-bugzilla-bot": {
-    "description": "",
+    "description": "Bot for bugzilla maintenance",
     "name": "sysadmin-bugzilla-bot",
     "project_path": "sysadmin/bugzilla-bot",
     "repo_path": "sysadmin/bugzilla-bot"
@@ -6570,25 +6594,25 @@
     "repo_path": "sysadmin/sysadmin-docs"
   },
   "sysadmin-geoip-service-backend": {
-    "description": "",
+    "description": "GeoIP resolution service",
     "name": "sysadmin-geoip-service-backend",
     "project_path": "sysadmin/geoip-service-backend",
     "repo_path": "sysadmin/geoip-service-backend"
   },
   "sysadmin-gerrit-all-projects": {
-    "description": "",
+    "description": "Empty repository",
     "name": "sysadmin-gerrit-all-projects",
     "project_path": "sysadmin/gerrit-all-projects",
     "repo_path": "sysadmin/gerrit-all-projects"
   },
   "sysadmin-gerrit-ci-matrix": {
-    "description": "",
+    "description": "Gerrit project compilation and test status matrix",
     "name": "sysadmin-gerrit-ci-matrix",
     "project_path": "sysadmin/gerrit-ci-matrix",
     "repo_path": "sysadmin/gerrit-ci-matrix"
   },
   "sysadmin-gerrit-gear": {
-    "description": "",
+    "description": "Component of Zuul and Gerrit system",
     "name": "sysadmin-gerrit-gear",
     "project_path": "sysadmin/gerrit-gear",
     "repo_path": "sysadmin/gerrit-gear"
@@ -6600,43 +6624,43 @@
     "repo_path": "sysadmin/gerrit-imported-projects"
   },
   "sysadmin-gerrit-infra-projects": {
-    "description": "",
+    "description": "Empty repository",
     "name": "sysadmin-gerrit-infra-projects",
     "project_path": "sysadmin/gerrit-infra-projects",
     "repo_path": "sysadmin/gerrit-infra-projects"
   },
   "sysadmin-gerrit-kde-ci-checked-projects": {
-    "description": "",
+    "description": "Empty repository",
     "name": "sysadmin-gerrit-kde-ci-checked-projects",
     "project_path": "sysadmin/gerrit-kde-ci-checked-projects",
     "repo_path": "sysadmin/gerrit-kde-ci-checked-projects"
   },
   "sysadmin-gerrit-kde-ci-enforced-projects": {
-    "description": "",
+    "description": "Empty repository",
     "name": "sysadmin-gerrit-kde-ci-enforced-projects",
     "project_path": "sysadmin/gerrit-kde-ci-enforced-projects",
     "repo_path": "sysadmin/gerrit-kde-ci-enforced-projects"
   },
   "sysadmin-gerrit-kde-traditional-projects": {
-    "description": "",
+    "description": "Empty repository",
     "name": "sysadmin-gerrit-kde-traditional-projects",
     "project_path": "sysadmin/gerrit-kde-traditional-projects",
     "repo_path": "sysadmin/gerrit-kde-traditional-projects"
   },
   "sysadmin-gerrit-project-config": {
-    "description": "",
+    "description": "Configuration for some Gerrit CI components",
     "name": "sysadmin-gerrit-project-config",
     "project_path": "sysadmin/gerrit-project-config",
     "repo_path": "sysadmin/gerrit-project-config"
   },
   "sysadmin-gerrit-turbo-hipster": {
-    "description": "",
+    "description": "Turbo hipster setup for Gerrit",
     "name": "sysadmin-gerrit-turbo-hipster",
     "project_path": "sysadmin/gerrit-turbo-hipster",
     "repo_path": "sysadmin/gerrit-turbo-hipster"
   },
   "sysadmin-gerrit-zuul": {
-    "description": "",
+    "description": "Code and configuration for Zuul instance",
     "name": "sysadmin-gerrit-zuul",
     "project_path": "sysadmin/gerrit-zuul",
     "repo_path": "sysadmin/gerrit-zuul"
@@ -6702,55 +6726,55 @@
     "repo_path": "sysadmin/neon-appstream-extra-metainfo"
   },
   "sysadmin-neon-image-syncd": {
-    "description": "",
+    "description": "Neon image RSync daemon",
     "name": "sysadmin-neon-image-syncd",
     "project_path": "sysadmin/neon-image-syncd",
     "repo_path": "sysadmin/neon-image-syncd"
   },
   "sysadmin-neon-logind-cleanup": {
-    "description": "",
+    "description": "Logind session cleaner for Neon",
     "name": "sysadmin-neon-logind-cleanup",
     "project_path": "sysadmin/neon-logind-cleanup",
     "repo_path": "sysadmin/neon-logind-cleanup"
   },
   "sysadmin-neon-openqa": {
-    "description": "",
+    "description": "Neon components for OpenQA",
     "name": "sysadmin-neon-openqa",
     "project_path": "sysadmin/neon-openqa",
     "repo_path": "sysadmin/neon-openqa"
   },
   "sysadmin-neon-server-deploy": {
-    "description": "",
+    "description": "Tooling for Neon server deployment",
     "name": "sysadmin-neon-server-deploy",
     "project_path": "sysadmin/neon-server-deploy",
     "repo_path": "sysadmin/neon-server-deploy"
   },
   "sysadmin-neon-sftp-bridge": {
-    "description": "",
+    "description": "Bridging daemon for Neon SFTP-to-HTTP",
     "name": "sysadmin-neon-sftp-bridge",
     "project_path": "sysadmin/neon-sftp-bridge",
     "repo_path": "sysadmin/neon-sftp-bridge"
   },
   "sysadmin-neon-tooling": {
-    "description": "",
+    "description": "Tooling for Neon",
     "name": "sysadmin-neon-tooling",
     "project_path": "sysadmin/neon-tooling",
     "repo_path": "sysadmin/neon-tooling"
   },
   "sysadmin-projects-api": {
-    "description": "",
+    "description": "API for Projects",
     "name": "sysadmin-projects-api",
     "project_path": "sysadmin/projects-api",
     "repo_path": "sysadmin/projects-api"
   },
   "sysadmin-rbot-plugin-kde-bugzilla": {
-    "description": "",
+    "description": "RBot plugin for resolving Bugzilla items",
     "name": "sysadmin-rbot-plugin-kde-bugzilla",
     "project_path": "sysadmin/rbot-plugin-kde-bugzilla",
     "repo_path": "sysadmin/rbot-plugin-kde-bugzilla"
   },
   "sysadmin-rbot-plugin-kde-phabricator": {
-    "description": "",
+    "description": "RBot plugin for resolving Phabricator items",
     "name": "sysadmin-rbot-plugin-kde-phabricator",
     "project_path": "sysadmin/rbot-plugin-kde-phabricator",
     "repo_path": "sysadmin/rbot-plugin-kde-phabricator"
@@ -6794,13 +6818,13 @@
   "systemdgenie": {
     "description": "Systemd managment utility",
     "name": "systemdgenie",
-    "project_path": "playground/sysadmin/systemdgenie",
+    "project_path": "sysadmin/systemdgenie",
     "repo_path": "system/systemdgenie"
   },
   "systemsettings": {
     "description": "Control center to configure your Plasma Desktop",
     "name": "systemsettings",
-    "project_path": "kde/workspace/systemsettings",
+    "project_path": "workspace/systemsettings",
     "repo_path": "plasma/systemsettings"
   },
   "taglib": {
@@ -6818,19 +6842,19 @@
   "telepathy-logger-qt": {
     "description": "Qt wrapper around TpLogger client library",
     "name": "telepathy-logger-qt",
-    "project_path": "extragear/network/telepathy/telepathy-logger-qt",
+    "project_path": "network/telepathy/telepathy-logger-qt",
     "repo_path": "network/telepathy-logger-qt"
   },
   "tellico": {
     "description": "Collection management software, free and simple",
     "name": "tellico",
-    "project_path": "extragear/office/tellico",
+    "project_path": "office/tellico",
     "repo_path": "office/tellico"
   },
   "telly-skout": {
     "description": "Convergent TV guide based on Kirigami.",
     "name": "telly-skout",
-    "project_path": "extragear/utilities/telly-skout",
+    "project_path": "utilities/telly-skout",
     "repo_path": "utilities/telly-skout"
   },
   "threadweaver": {
@@ -6842,43 +6866,43 @@
   "tikzkit": {
     "description": "WYSIWYG editor to create PGF/TikZ pictures",
     "name": "tikzkit",
-    "project_path": "playground/graphics/tikzkit",
+    "project_path": "graphics/tikzkit",
     "repo_path": "graphics/tikzkit"
   },
   "toad": {
     "description": "Organize your tasks",
     "name": "toad",
-    "project_path": "playground/utilities/toad",
+    "project_path": "utilities/toad",
     "repo_path": "utilities/toad"
   },
   "tok": {
     "description": "Telegram client built using Kirigami",
     "name": "tok",
-    "project_path": "playground/network/tok",
+    "project_path": "network/tok",
     "repo_path": "network/tok"
   },
   "tokodon": {
     "description": "Tokodon is a Mastodon client for Plasma and Plasma Mobile",
     "name": "tokodon",
-    "project_path": "extragear/network/tokodon",
+    "project_path": "network/tokodon",
     "repo_path": "network/tokodon"
   },
   "totalreqall": {
     "description": "A program for memorizing the Bible and other works. Uses the Sword library.",
     "name": "totalreqall",
-    "project_path": "playground/utilities/totalreqall",
+    "project_path": "utilities/totalreqall",
     "repo_path": "utilities/totalreqall"
   },
   "trainer": {
     "description": "Application to help you practice sport exercises with a description and duration",
     "name": "trainer",
-    "project_path": "playground/mobile/trainer",
+    "project_path": "mobile/trainer",
     "repo_path": "plasma-mobile/trainer"
   },
   "trojita": {
     "description": "Fast, lightweight and standard-compliant IMAP e-mail client",
     "name": "trojita",
-    "project_path": "playground/pim/trojita",
+    "project_path": "pim/trojita",
     "repo_path": "pim/trojita"
   },
   "tupi": {
@@ -6890,37 +6914,37 @@
   "twine2": {
     "description": "Python bindings SIP updater that processes C++ header files into Riverbank SIP",
     "name": "twine2",
-    "project_path": "playground/bindings/twine2",
+    "project_path": "bindings/twine2",
     "repo_path": "libraries/twine2"
   },
   "ubiquity-slideshow-neon": {
     "description": "Neon slideshow for Ubiquity",
     "name": "ubiquity-slideshow-neon",
-    "project_path": "playground/base/ubiquity-slideshow-neon",
+    "project_path": "base/ubiquity-slideshow-neon",
     "repo_path": "system/ubiquity-slideshow-neon"
   },
   "ufw-kde": {
     "description": "GUI Interface for Uncomplicated Firewall (UFW).",
     "name": "ufw-kde",
-    "project_path": "playground/sysadmin/ufw-kde",
+    "project_path": "sysadmin/ufw-kde",
     "repo_path": "unmaintained/ufw-kde"
   },
   "umbrello": {
     "description": "GUI for diagramming Unified Modelling Language (UML)",
     "name": "umbrello",
-    "project_path": "kde/kdesdk/umbrello",
+    "project_path": "kdesdk/umbrello",
     "repo_path": "sdk/umbrello"
   },
   "union": {
     "description": "A Qt style supporting both QtQuick and QtWidgets.",
     "name": "union",
-    "project_path": "playground/workspace/union",
+    "project_path": "workspace/union",
     "repo_path": "plasma/union"
   },
   "upnp-lib-qt": {
     "description": "UPnP wrapper for Qt",
     "name": "upnp-lib-qt",
-    "project_path": "playground/base/upnp-lib-qt",
+    "project_path": "base/upnp-lib-qt",
     "repo_path": "libraries/upnp-lib-qt"
   },
   "user-manager": {
@@ -6932,13 +6956,13 @@
   "vail": {
     "description": "Communicate using Morse",
     "name": "vail",
-    "project_path": "playground/utils/vail",
+    "project_path": "utils/vail",
     "repo_path": "utilities/vail"
   },
   "vakzination": {
     "description": "Vakzination manages your health certificates like vaccination, test, and recovery certificates.",
     "name": "vakzination",
-    "project_path": "playground/pim/vakzination",
+    "project_path": "pim/vakzination",
     "repo_path": "pim/vakzination"
   },
   "veritas": {
@@ -6950,19 +6974,19 @@
   "vvave": {
     "description": "Multi-platform media player",
     "name": "vvave",
-    "project_path": "playground/multimedia/vvave",
+    "project_path": "multimedia/vvave",
     "repo_path": "maui/vvave"
   },
   "wacomtablet": {
     "description": "GUI for Wacom Linux drivers that supports different button/pen layout profiles",
     "name": "wacomtablet",
-    "project_path": "kde/workspace/wacomtablet",
+    "project_path": "workspace/wacomtablet",
     "repo_path": "plasma/wacomtablet"
   },
   "washipad": {
     "description": "A minimalist application for sketchnoting",
     "name": "washipad",
-    "project_path": "playground/utils/washipad",
+    "project_path": "utils/washipad",
     "repo_path": "graphics/washipad"
   },
   "wayland": {
@@ -8054,13 +8078,13 @@
   "whoopsie-kcm": {
     "description": "A KCM for talking to Ubuntu error tracker submission system Whoopsie",
     "name": "whoopsie-kcm",
-    "project_path": "playground/base/whoopsie-kcm",
+    "project_path": "base/whoopsie-kcm",
     "repo_path": "system/whoopsie-kcm"
   },
   "wicd-kde": {
-    "description": "A Wicd client built on the KDE Development Platform.\n\n!http://kde-apps.org/CONTENT/content-pre1/132366-1.png!",
+    "description": "A Wicd client built on the KDE Development Platform",
     "name": "wicd-kde",
-    "project_path": "extragear/network/wicd-kde",
+    "project_path": "network/wicd-kde",
     "repo_path": "unmaintained/wicd-kde"
   },
   "wiki-reader": {
@@ -8072,139 +8096,139 @@
   "wikidata-voice-application": {
     "description": "Wikidata information voice application and mycroft skill for Plasma Bigscreen",
     "name": "wikidata-voice-application",
-    "project_path": "playground/utils/wikidata-voice-application",
+    "project_path": "utils/wikidata-voice-application",
     "repo_path": "plasma-bigscreen/wikidata-voice-application"
   },
   "wikitolearn-backend-for-frontend": {
     "description": "Backend for the Frontend System of WIkiToLearn",
     "name": "wikitolearn-backend-for-frontend",
-    "project_path": "playground/www/wikitolearn-backend-for-frontend",
+    "project_path": "www/wikitolearn-backend-for-frontend",
     "repo_path": "unmaintained/wikitolearn-backend-for-frontend"
   },
   "wikitolearn-chapters-backend": {
     "description": "Chapters Backend for WikiToLearn",
     "name": "wikitolearn-chapters-backend",
-    "project_path": "playground/www/wikitolearn-chapters-backend",
+    "project_path": "www/wikitolearn-chapters-backend",
     "repo_path": "unmaintained/wikitolearn-chapters-backend"
   },
   "wikitolearn-content-migration": {
     "description": "Content Migration Assistants for WikiToLearn",
     "name": "wikitolearn-content-migration",
-    "project_path": "playground/www/wikitolearn-content-migration",
+    "project_path": "www/wikitolearn-content-migration",
     "repo_path": "unmaintained/wikitolearn-content-migration"
   },
   "wikitolearn-course-midtier": {
     "description": "Mid Tier Course Support for WikiToLearn",
     "name": "wikitolearn-course-midtier",
-    "project_path": "playground/www/wikitolearn-course-midtier",
+    "project_path": "www/wikitolearn-course-midtier",
     "repo_path": "unmaintained/wikitolearn-course-midtier"
   },
   "wikitolearn-courses-backend": {
     "description": "Courses Backend for WikiToLearn",
     "name": "wikitolearn-courses-backend",
-    "project_path": "playground/www/wikitolearn-courses-backend",
+    "project_path": "www/wikitolearn-courses-backend",
     "repo_path": "unmaintained/wikitolearn-courses-backend"
   },
   "wikitolearn-coursessecurity-backend": {
     "description": "Backend Components of Course Security system for WikiToLearn",
     "name": "wikitolearn-coursessecurity-backend",
-    "project_path": "playground/www/wikitolearn-coursessecurity-backend",
+    "project_path": "www/wikitolearn-coursessecurity-backend",
     "repo_path": "unmaintained/wikitolearn-coursessecurity-backend"
   },
   "wikitolearn-docs": {
     "description": "Documentation for WikiToLearn",
     "name": "wikitolearn-docs",
-    "project_path": "playground/www/wikitolearn-docs",
+    "project_path": "www/wikitolearn-docs",
     "repo_path": "unmaintained/wikitolearn-docs"
   },
   "wikitolearn-docs-atundo": {
     "description": "Atundo Documentation for WikiToLearn",
     "name": "wikitolearn-docs-atundo",
-    "project_path": "playground/www/wikitolearn-docs-atundo",
+    "project_path": "www/wikitolearn-docs-atundo",
     "repo_path": "unmaintained/wikitolearn-docs-atundo"
   },
   "wikitolearn-frontend": {
     "description": "Frontend for WikiToLearn",
     "name": "wikitolearn-frontend",
-    "project_path": "playground/www/wikitolearn-frontend",
+    "project_path": "www/wikitolearn-frontend",
     "repo_path": "unmaintained/wikitolearn-frontend"
   },
   "wikitolearn-keycloak-mediawiki-btypepassword-patch": {
     "description": "btypepassword patch for Keycloak's Mediawiki integration",
     "name": "wikitolearn-keycloak-mediawiki-btypepassword-patch",
-    "project_path": "playground/www/wikitolearn-keycloak-mediawiki-btypepassword-patch",
+    "project_path": "www/wikitolearn-keycloak-mediawiki-btypepassword-patch",
     "repo_path": "unmaintained/wikitolearn-keycloak-mediawiki-btypepassword-patch"
   },
   "wikitolearn-keycloak-theme": {
     "description": "Keycloak Theme used by WikiToLearn",
     "name": "wikitolearn-keycloak-theme",
-    "project_path": "playground/www/wikitolearn-keycloak-theme",
+    "project_path": "www/wikitolearn-keycloak-theme",
     "repo_path": "unmaintained/wikitolearn-keycloak-theme"
   },
   "wikitolearn-math-backend": {
     "description": "Math Backend for WikiToLearn",
     "name": "wikitolearn-math-backend",
-    "project_path": "playground/www/wikitolearn-math-backend",
+    "project_path": "www/wikitolearn-math-backend",
     "repo_path": "unmaintained/wikitolearn-math-backend"
   },
   "wikitolearn-math-midtier": {
     "description": "Mid Tier Math Support for WikiToLearn",
     "name": "wikitolearn-math-midtier",
-    "project_path": "playground/www/wikitolearn-math-midtier",
+    "project_path": "www/wikitolearn-math-midtier",
     "repo_path": "unmaintained/wikitolearn-math-midtier"
   },
   "wikitolearn-media-midtier": {
     "description": "Mid Tier Media Support for WikiToLearn",
     "name": "wikitolearn-media-midtier",
-    "project_path": "playground/www/wikitolearn-media-midtier",
+    "project_path": "www/wikitolearn-media-midtier",
     "repo_path": "unmaintained/wikitolearn-media-midtier"
   },
   "wikitolearn-offline-extension": {
     "description": "OfflineExtension is an extension for WikiToLearn that will add offline support to the current Wiki Editor.",
     "name": "wikitolearn-offline-extension",
-    "project_path": "playground/www/wikitolearn-offline-extension",
+    "project_path": "www/wikitolearn-offline-extension",
     "repo_path": "unmaintained/wikitolearn-offline-extension"
   },
   "wikitolearn-pages-backend": {
     "description": "Pages Backend for WikiToLearn",
     "name": "wikitolearn-pages-backend",
-    "project_path": "playground/www/wikitolearn-pages-backend",
+    "project_path": "www/wikitolearn-pages-backend",
     "repo_path": "unmaintained/wikitolearn-pages-backend"
   },
   "wikitolearn-pdf-backend": {
     "description": "PDF Backend for WikiToLearn",
     "name": "wikitolearn-pdf-backend",
-    "project_path": "playground/www/wikitolearn-pdf-backend",
+    "project_path": "www/wikitolearn-pdf-backend",
     "repo_path": "unmaintained/wikitolearn-pdf-backend"
   },
   "wikitolearn-pwa-gateway": {
     "description": "PWA Gateway for WikiToLearn",
     "name": "wikitolearn-pwa-gateway",
-    "project_path": "playground/www/wikitolearn-pwa-gateway",
+    "project_path": "www/wikitolearn-pwa-gateway",
     "repo_path": "unmaintained/wikitolearn-pwa-gateway"
   },
   "wikitolearn-sdk": {
     "description": "SDK for WikiToLearn",
     "name": "wikitolearn-sdk",
-    "project_path": "playground/www/wikitolearn-sdk",
+    "project_path": "www/wikitolearn-sdk",
     "repo_path": "unmaintained/wikitolearn-sdk"
   },
   "wikitolearn-shared-services": {
     "description": "Shared Services for WikiToLearn",
     "name": "wikitolearn-shared-services",
-    "project_path": "playground/www/wikitolearn-shared-services",
+    "project_path": "www/wikitolearn-shared-services",
     "repo_path": "unmaintained/wikitolearn-shared-services"
   },
   "wikitolearn-shibboleth-discovery": {
     "description": "Shibboleth discovery support for WikiToLearn",
     "name": "wikitolearn-shibboleth-discovery",
-    "project_path": "playground/www/wikitolearn-shibboleth-discovery",
+    "project_path": "www/wikitolearn-shibboleth-discovery",
     "repo_path": "unmaintained/wikitolearn-shibboleth-discovery"
   },
   "wikitolearn-translation": {
     "description": "Translation Support for WikiToLearn",
     "name": "wikitolearn-translation",
-    "project_path": "playground/www/wikitolearn-translation",
+    "project_path": "www/wikitolearn-translation",
     "repo_path": "unmaintained/wikitolearn-translation"
   },
   "xbuilder": {
@@ -8216,13 +8240,13 @@
   "xdg-desktop-portal-kde": {
     "description": "A backend implementation for xdg-desktop-portal that is using Qt/KDE",
     "name": "xdg-desktop-portal-kde",
-    "project_path": "kde/workspace/xdg-desktop-portal-kde",
+    "project_path": "workspace/xdg-desktop-portal-kde",
     "repo_path": "plasma/xdg-desktop-portal-kde"
   },
   "xdg-portal-test-kde": {
     "description": "Test application for Flatpak portals and Qt Flatpak platform plugin",
     "name": "xdg-portal-test-kde",
-    "project_path": "playground/base/xdg-portal-test-kde",
+    "project_path": "base/xdg-portal-test-kde",
     "repo_path": "libraries/xdg-portal-test-kde"
   },
   "xsettings-kde": {
@@ -8240,55 +8264,55 @@
   "xwaylandvideobridge": {
     "description": "Utility to allow streaming Wayland windows to X applications",
     "name": "xwaylandvideobridge",
-    "project_path": "playground/system/xwaylandvideobridge",
+    "project_path": "system/xwaylandvideobridge",
     "repo_path": "system/xwaylandvideobridge"
   },
   "yakuake": {
     "description": "Drop-down terminal emulator based on Konsole technologies",
     "name": "yakuake",
-    "project_path": "kde/applications/yakuake",
+    "project_path": "applications/yakuake",
     "repo_path": "utilities/yakuake"
   },
   "yocto-manifest": {
     "description": "Tracking of Yocto meta-layers for use with KDE",
     "name": "yocto-manifest",
-    "project_path": "playground/packaging/yocto-manifest",
+    "project_path": "packaging/yocto-manifest",
     "repo_path": "packaging/yocto-manifest"
   },
   "yocto-meta-kde": {
     "description": "Yocto packaging metadata for KDE projects",
     "name": "yocto-meta-kde",
-    "project_path": "playground/packaging/yocto-meta-kde",
+    "project_path": "packaging/yocto-meta-kde",
     "repo_path": "packaging/yocto-meta-kde"
   },
   "yocto-meta-kde-demo": {
     "description": "Yocto Demo Image for KDE projects",
     "name": "yocto-meta-kde-demo",
-    "project_path": "playground/packaging/yocto-meta-kde-demo",
+    "project_path": "packaging/yocto-meta-kde-demo",
     "repo_path": "packaging/yocto-meta-kde-demo"
   },
   "yocto-meta-kf5": {
     "description": "Yocto packaging metadata for KDE Frameworks",
     "name": "yocto-meta-kf5",
-    "project_path": "playground/packaging/yocto-meta-kf5",
+    "project_path": "packaging/yocto-meta-kf5",
     "repo_path": "packaging/yocto-meta-kf5"
   },
   "yocto-meta-kf6": {
     "description": "Yocto packaging metadata for KDE Frameworks 6",
     "name": "yocto-meta-kf6",
-    "project_path": "playground/packaging/yocto-meta-kf6",
+    "project_path": "packaging/yocto-meta-kf6",
     "repo_path": "packaging/yocto-meta-kf6"
   },
   "youtube-voice-application": {
     "description": "Youtube video player voice application and mycroft skill for Plasma Bigscreen",
     "name": "youtube-voice-application",
-    "project_path": "playground/utils/youtube-voice-application",
+    "project_path": "utils/youtube-voice-application",
     "repo_path": "plasma-bigscreen/youtube-voice-application"
   },
   "zanshin": {
     "description": "Getting Things Done application which aims at getting your mind like water",
     "name": "zanshin",
-    "project_path": "kde/pim/zanshin",
+    "project_path": "pim/zanshin",
     "repo_path": "pim/zanshin"
   },
   "zxing-cpp": {
diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 485229137256..5ed6c2f595f1 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -1,362 +1,362 @@
 {
   "attica": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/attica-6.14.0.tar.xz",
-    "hash": "sha256-fDVWr+sK4OkywuTTCd9JBfPi9Brz47OAUbSdnyeTV8E="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/attica-6.15.0.tar.xz",
+    "hash": "sha256-4tCB8I1eajYYNjE7IJHU1adRjA972ve1PS25cLWgJz8="
   },
   "baloo": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/baloo-6.14.0.tar.xz",
-    "hash": "sha256-q2D5Q2B/Z5KbYZwClJjwf6h2euxqf7Auz3OSztJXNLQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/baloo-6.15.0.tar.xz",
+    "hash": "sha256-JBAV/RTqD88oEID9FgmU+StuC6B1DPr9SI0xvw4Kf08="
   },
   "bluez-qt": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/bluez-qt-6.14.0.tar.xz",
-    "hash": "sha256-6oRfkw7MfE8lnEeK5mgMeTldyyWY7j9bRbztbfJ3+dU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/bluez-qt-6.15.0.tar.xz",
+    "hash": "sha256-DHCoQ347EKYlkmBiPUgCxEIvf5vU/feb9Swl/uVQEic="
   },
   "breeze-icons": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/breeze-icons-6.14.0.tar.xz",
-    "hash": "sha256-zfnLZ86dbrmWnsMkzpJVbK8alPEncMVs8MWI3CxoHS8="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/breeze-icons-6.15.0.tar.xz",
+    "hash": "sha256-JdkhAvlVTqI+tu6BQ0OVtRfZP8huXgQVg0p/9EnvhVw="
   },
   "extra-cmake-modules": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/extra-cmake-modules-6.14.0.tar.xz",
-    "hash": "sha256-0Cy7syabOWgIhKv28Uumj0SFcMVUFz9SSdo7h2F4TBM="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/extra-cmake-modules-6.15.0.tar.xz",
+    "hash": "sha256-980CIJWp5r2+WJdyCiS/2oHSEXV7fAixcwYZYr8u4LI="
   },
   "frameworkintegration": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/frameworkintegration-6.14.0.tar.xz",
-    "hash": "sha256-6iY3It5LN8h0KnCrBX2gYuW3HQ4I6YZFaj3ETiDwA7c="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/frameworkintegration-6.15.0.tar.xz",
+    "hash": "sha256-bmSHDl09zuKn99ClCbUjZmf6EfeN04zYkjkR8cp7p4Y="
   },
   "kapidox": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kapidox-6.14.0.tar.xz",
-    "hash": "sha256-zXuXa5jR5sbMPaHSDFOVM+DRrnYl5j4UvHx4EJapFUY="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kapidox-6.15.0.tar.xz",
+    "hash": "sha256-VjNGhVjB9liKq1NyrxlRgmZtFhHzQO2Swg/9OE0Z+Jg="
   },
   "karchive": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/karchive-6.14.0.tar.xz",
-    "hash": "sha256-LLL1TLn4Ey2vaIpdSs1/S+xAIDsBVR/wbm2h6fh/Dvk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/karchive-6.15.0.tar.xz",
+    "hash": "sha256-7XQghyLgjdYG89bXMAf6/BoAzInC4p4xl1YC/vRaDxg="
   },
   "kauth": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kauth-6.14.0.tar.xz",
-    "hash": "sha256-9aFuSJ8mtXQdPxG/ayA/2ZqE7KrnmOtrDqoNcciPZkU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kauth-6.15.0.tar.xz",
+    "hash": "sha256-Gce1mKeAulvv0w8l3mlFNoEaRqViLEosKIkvLzulphc="
   },
   "kbookmarks": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kbookmarks-6.14.0.tar.xz",
-    "hash": "sha256-o/CmH8/MplCfHX0hKJ4yd2YW58rd7AfLnhyoHi946kM="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kbookmarks-6.15.0.tar.xz",
+    "hash": "sha256-BsqMYZ1Sr3vCe4nQs6yZy9EIIHVrKZQT6C+RZP5fuGM="
   },
   "kcalendarcore": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcalendarcore-6.14.0.tar.xz",
-    "hash": "sha256-cCv8Lt/O1NCQM2VldDT9jC3AuPZtDOluTqC2lQ74eYs="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcalendarcore-6.15.0.tar.xz",
+    "hash": "sha256-ExQ08ZyTF0LYTwcRP7sFPqGj22EBMCU+K7kn6OrNHTk="
   },
   "kcmutils": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcmutils-6.14.0.tar.xz",
-    "hash": "sha256-IzbwXuRmaN4r5wwwFmDJ06iBxABG75DRIF5AgmC0YAU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcmutils-6.15.0.tar.xz",
+    "hash": "sha256-VuenZIZRzpaY6n0f+Yt/7GWYER030vKK4NZUfTyY/wQ="
   },
   "kcodecs": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcodecs-6.14.0.tar.xz",
-    "hash": "sha256-AI9ZEhYtOUSYAi0OlVyGDHfDOGfo+kSOmUSPOjZNaRQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcodecs-6.15.0.tar.xz",
+    "hash": "sha256-vfV3M/LWQcsMt0nO1fb2fkLI6dF9s/bC5qIFTIZjbsE="
   },
   "kcolorscheme": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcolorscheme-6.14.0.tar.xz",
-    "hash": "sha256-YBswTdXML7Bl2OZYvbC4fh43AhAAz2pvWy7opb+69ck="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcolorscheme-6.15.0.tar.xz",
+    "hash": "sha256-d54dBOXKAlG2x1xZyevLvJ1b7qJ1YoqmhdAmDsmKVfI="
   },
   "kcompletion": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcompletion-6.14.0.tar.xz",
-    "hash": "sha256-065qmjZfE9Ha5AQLtMl86Gp0hlym7SH5CBEVmKITgTY="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcompletion-6.15.0.tar.xz",
+    "hash": "sha256-k4ytMY3KovyouLjUhT+j96vYM9zwO1HhmhdOYZXMwn0="
   },
   "kconfig": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kconfig-6.14.0.tar.xz",
-    "hash": "sha256-obJ+dit4+8NBJPNf1BJXEfQDauUyx50889xoMonB52U="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kconfig-6.15.0.tar.xz",
+    "hash": "sha256-yORMn3kLAXHopbLw+jCscKlcxlXHEWUOVLlTM1vmuWs="
   },
   "kconfigwidgets": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kconfigwidgets-6.14.0.tar.xz",
-    "hash": "sha256-Av7maFktUrs5KU+ZmvZ3l9eXfj8cYbucd8CGcwWUMZ8="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kconfigwidgets-6.15.0.tar.xz",
+    "hash": "sha256-8Aai/PaNJPe3K3aOBe5bmmHyxd3u6HpvyaAiyDrT8LI="
   },
   "kcontacts": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcontacts-6.14.0.tar.xz",
-    "hash": "sha256-ZP1vJpLcW+qbxyD1K/2yiAdx2C2yfhycD2GshG5QNyk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcontacts-6.15.0.tar.xz",
+    "hash": "sha256-mxgJVcgPegn49VLfenCFAf20xPC87hDC5HOsZ+orRXo="
   },
   "kcoreaddons": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcoreaddons-6.14.0.tar.xz",
-    "hash": "sha256-lVXRcpX0/s4YtG49KJBVuvWLNS4ILk2m5uNS2NXAQu4="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcoreaddons-6.15.0.tar.xz",
+    "hash": "sha256-l4w7DYsRtoH/B7vWppU9VM4con57xT2TRy3Za5QjKNc="
   },
   "kcrash": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kcrash-6.14.0.tar.xz",
-    "hash": "sha256-adc2vnO75Kk2+JlsNZGlPBaBbUOW0kLS5j3OB5omjDQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kcrash-6.15.0.tar.xz",
+    "hash": "sha256-mSSMfKikwqF4NqjMNP+rkgoiO4CVApxjBGE92XNPFHQ="
   },
   "kdav": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdav-6.14.0.tar.xz",
-    "hash": "sha256-qSuV+wYSx5xYdOeoX0g2nDoA0sHS2Ux3ZWIpyUXnfCo="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdav-6.15.0.tar.xz",
+    "hash": "sha256-/OWsZhvyDpmuB9Q/tWZWcY+Qn7mL9idWyB8WJAxTV54="
   },
   "kdbusaddons": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdbusaddons-6.14.0.tar.xz",
-    "hash": "sha256-9nPJ8pXfWZiUje+UyvktSH1jiGRSgC/7l60VExVifuQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdbusaddons-6.15.0.tar.xz",
+    "hash": "sha256-/Mwf7zx0WQ0oozQs91a7D/hzdzNsoTZi712qfa+v42A="
   },
   "kdeclarative": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdeclarative-6.14.0.tar.xz",
-    "hash": "sha256-7QqmJlP+Wgm8RPWE+qpjPLOG96EGz5tckwEirobAodA="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdeclarative-6.15.0.tar.xz",
+    "hash": "sha256-NydIDzw+NsiCQcy8rorEB4/wHmaRFAla/K2e4UuqAJ0="
   },
   "kded": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kded-6.14.0.tar.xz",
-    "hash": "sha256-WfGuyUvQF266i//TWmrVklttQHAuJu4Wl6RrOkYX0co="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kded-6.15.0.tar.xz",
+    "hash": "sha256-C0wPGUD+HxjU2sxn9mP204Ih3md/lNn7OYhqKwYW1DQ="
   },
   "kdesu": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdesu-6.14.0.tar.xz",
-    "hash": "sha256-EDoGMRwDVEX9WISEXFc2nwcikjn5u+vpHMlbfOjFyiM="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdesu-6.15.0.tar.xz",
+    "hash": "sha256-nrTBGhdCryyxfPHn4Yuw+9tF7hbwg3OcQYy+nUWvGAY="
   },
   "kdnssd": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdnssd-6.14.0.tar.xz",
-    "hash": "sha256-zpA5UrkIVmuZ1QpKVJgl6k75XXVEaGzczM9pO4EQYZk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdnssd-6.15.0.tar.xz",
+    "hash": "sha256-GSFko5XOnwZnGEyuePNpp8C4rKsODQc83tsqVLx8TVo="
   },
   "kdoctools": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kdoctools-6.14.0.tar.xz",
-    "hash": "sha256-rLnHYejhDDDywyBh9kCWllRZoFEyUO30Qy9AgxoPU24="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kdoctools-6.15.0.tar.xz",
+    "hash": "sha256-QwvlkFsL9t+0t+DiwK63WYbu8KMPEzINnUyrkH/Wvvc="
   },
   "kfilemetadata": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kfilemetadata-6.14.0.tar.xz",
-    "hash": "sha256-klqdsnF2UZCZ0kYlBwv368FgD65+fQauTu4yeaZ9MeU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kfilemetadata-6.15.0.tar.xz",
+    "hash": "sha256-0eYs4bf9ZehIqBohG7XLESbM4TVPcDEqAQTAnAPdZUI="
   },
   "kglobalaccel": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kglobalaccel-6.14.0.tar.xz",
-    "hash": "sha256-56rKFrtMW1hlrz7UtI8jR8UWMGXRfCskvpd1L/Xoxx0="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kglobalaccel-6.15.0.tar.xz",
+    "hash": "sha256-hOp3elOTlIPNl9HdwGkzOvHoFBm/7g9txdtNPTYKtVQ="
   },
   "kguiaddons": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kguiaddons-6.14.0.tar.xz",
-    "hash": "sha256-PzzH43SL101Hako2FmVHhufYYfezkehJmuvHxBDyHsU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kguiaddons-6.15.0.tar.xz",
+    "hash": "sha256-Vty6tMIwmyg0O+1zkBxTBxxAnf0HdoQN1t2S4tRw168="
   },
   "kholidays": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kholidays-6.14.0.tar.xz",
-    "hash": "sha256-bdZvy6r8jUUEWson4zTh9g32r9mgcLHzKZa6BJcncXc="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kholidays-6.15.0.tar.xz",
+    "hash": "sha256-OWhgudY9O7jwywxDPguzz3chOUhC8/uDicg+B7oK5pU="
   },
   "ki18n": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/ki18n-6.14.0.tar.xz",
-    "hash": "sha256-KlE1QSyvCgfrpO62CGesaSnfHIPBRa51emoSMPhC5mk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/ki18n-6.15.0.tar.xz",
+    "hash": "sha256-GJd1XZ/eWhvqb31xJEwmYrmRG0uIlMxTdAv+OLTV2R0="
   },
   "kiconthemes": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kiconthemes-6.14.0.tar.xz",
-    "hash": "sha256-qYzSMb/KQgUZ1VsLiOTgibTifsebSoVCuB3opf+K9tU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kiconthemes-6.15.0.tar.xz",
+    "hash": "sha256-iEJwOJlyL5q2tK7AtFw4vumJbjLazLPrF+8BRATJYGs="
   },
   "kidletime": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kidletime-6.14.0.tar.xz",
-    "hash": "sha256-FndbK9w+/VTGWpa85vJ6AB0RmQVTHYS7I+IyFaGW7Lg="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kidletime-6.15.0.tar.xz",
+    "hash": "sha256-COxHJIUCzcLIoAO0S1k2v9qdrid6GtuSGAGJJ0XofP4="
   },
   "kimageformats": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kimageformats-6.14.0.tar.xz",
-    "hash": "sha256-Og+BviXpoOq33BNzvFZICryzBByhpajH8NbVLSIdVEk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kimageformats-6.15.0.tar.xz",
+    "hash": "sha256-L6sRnGTxFwJhZvSYQKvlwe/j6PmhDZZrNAb/tqYIQDA="
   },
   "kio": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kio-6.14.0.tar.xz",
-    "hash": "sha256-mwN0b9AIUEqW9Wnzetj/kCzHFJXn4SPao8beef8qzEU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kio-6.15.0.tar.xz",
+    "hash": "sha256-LUzMW/Bwq8vJRaII7L8gF7OxlfqZ5M6165lQiI93wak="
   },
   "kirigami": {
-    "version": "6.14.1",
-    "url": "mirror://kde/stable/frameworks/6.14/kirigami-6.14.1.tar.xz",
-    "hash": "sha256-LJG04pUURPfW89at2W3EHGK/nb90eoWU1dL8kY0nMJ8="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kirigami-6.15.0.tar.xz",
+    "hash": "sha256-czrH2cGX/n3pD0FkNUm+PODzcj7NTUoVdYxMccr8JTE="
   },
   "kitemmodels": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kitemmodels-6.14.0.tar.xz",
-    "hash": "sha256-HWlBgEZOH9leJCXYS7hGFX+tPCpQCXJ+zbZ2bZfbIug="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kitemmodels-6.15.0.tar.xz",
+    "hash": "sha256-joydMaAMQe2DYYl1Woa4L9loR01jiPAzJZ3WWrGOfJQ="
   },
   "kitemviews": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kitemviews-6.14.0.tar.xz",
-    "hash": "sha256-mXFnQC26p4ha4qqkz4tfQJ9X1QvOBqO1bFd+k6l1uko="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kitemviews-6.15.0.tar.xz",
+    "hash": "sha256-DyfRiRR7uZK5ThpqVc7WLiqvXFs9g+QfJtaw4ml2V4A="
   },
   "kjobwidgets": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kjobwidgets-6.14.0.tar.xz",
-    "hash": "sha256-jEcEKvrldEeUW0PMkdiX+jUyhiN6Y+NSlL5OtKRmKr0="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kjobwidgets-6.15.0.tar.xz",
+    "hash": "sha256-1ce2jqiCl4WpH9bkx7OsVx1Yve4ZN3dkjlIJjEnwVP4="
   },
   "knewstuff": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/knewstuff-6.14.0.tar.xz",
-    "hash": "sha256-HkS3HvxdxMsFzHrdNE2aVfyMmY3ibnSGfTAK+9FvjQQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/knewstuff-6.15.0.tar.xz",
+    "hash": "sha256-10n+IViah832SEFuvRMDilNs2OAZUxNXpnGU5eowBn0="
   },
   "knotifications": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/knotifications-6.14.0.tar.xz",
-    "hash": "sha256-p26V3nQSnhL1ALAfjOJSm8avk7df8szpnIJxKVI9dRc="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/knotifications-6.15.0.tar.xz",
+    "hash": "sha256-l7+H61eIOrOuSDxHIGiKHKU5dwuZF5tkYQqAK7la7e4="
   },
   "knotifyconfig": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/knotifyconfig-6.14.0.tar.xz",
-    "hash": "sha256-Bn66XJllqwXN0+ilfWr6Jeip53kF1NAaMnU2wR1Myos="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/knotifyconfig-6.15.0.tar.xz",
+    "hash": "sha256-vwMTIh/O8OR0uWNjTG1SUmuYWDAOnvDhRK/ChOjcdKw="
   },
   "kpackage": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kpackage-6.14.0.tar.xz",
-    "hash": "sha256-+y4mD3ouK0z9pFWYgUhYmad89fvDuK4F0GREvsgu0as="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kpackage-6.15.0.tar.xz",
+    "hash": "sha256-XJYVu9kq9n4b8UeilzmjRqc7Of88RkD55AjVQwlmYS0="
   },
   "kparts": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kparts-6.14.0.tar.xz",
-    "hash": "sha256-lhBhAsTeuJMwfrNVgKikWqaEHtwDi5oP04qhnW4Fa/o="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kparts-6.15.0.tar.xz",
+    "hash": "sha256-M0q/jCrFmMVxFc6bhyrcWh+1DoiZvO1Bbjn9My48R0I="
   },
   "kpeople": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kpeople-6.14.0.tar.xz",
-    "hash": "sha256-ydIRDa8uTVnVi0r2PFT9UXuw9GWRqRwgeJ/8cV7rYs4="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kpeople-6.15.0.tar.xz",
+    "hash": "sha256-UAXzm3JXhWmgy5Uj5Xz45i6BVyMm/Gkb6fvs8o5jjqg="
   },
   "kplotting": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kplotting-6.14.0.tar.xz",
-    "hash": "sha256-5rYxhPlzvw0SQCd539GHH3aFt5VONomORkCshrnJd6w="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kplotting-6.15.0.tar.xz",
+    "hash": "sha256-X3EF8BXu5nrN64qW+5RIGGpgW2Jz8K+JoFXCchyrWdw="
   },
   "kpty": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kpty-6.14.0.tar.xz",
-    "hash": "sha256-l54LsZzX2duEO/XfNRFUR+tJJjegmetTw0W4L8gL6mU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kpty-6.15.0.tar.xz",
+    "hash": "sha256-0qacjJzG1pbExxc1e7bWWB9d32Sq2D6a6YkDsfLgqLE="
   },
   "kquickcharts": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kquickcharts-6.14.0.tar.xz",
-    "hash": "sha256-37M8kO7cfJUOBD+yrfbIot83ReedK7zV5ZV1dEj+mLc="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kquickcharts-6.15.0.tar.xz",
+    "hash": "sha256-+fL0vqV3/tin8d3qNGF+/nRRekkunAch8C8swI+2eG0="
   },
   "krunner": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/krunner-6.14.0.tar.xz",
-    "hash": "sha256-E4z7mM1zOSci9EmUCNB1osdwW9v0NuzAdzYMMVPbL6Y="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/krunner-6.15.0.tar.xz",
+    "hash": "sha256-jK4nEG0zVCJ5pc7GK8wOyv7ItUD1ODOPdKJ/oNCS+fM="
   },
   "kservice": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kservice-6.14.0.tar.xz",
-    "hash": "sha256-XvgPRwNNWCzgWgvs8BlSZjGR+vxWnPs+97hcJP0peoU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kservice-6.15.0.tar.xz",
+    "hash": "sha256-w3G/5uJellv03OHx5CyEwvaJl+1J3Bm9vGQZR4I1Jp0="
   },
   "kstatusnotifieritem": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kstatusnotifieritem-6.14.0.tar.xz",
-    "hash": "sha256-nYXESncErQUnQHUhBuWesm5J2ARn+bHTySvSS3c5VBc="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kstatusnotifieritem-6.15.0.tar.xz",
+    "hash": "sha256-JBMsyWdXBHi1TkTu8QY8GTIXgBJg3FGGDgiB+g2QvQ0="
   },
   "ksvg": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/ksvg-6.14.0.tar.xz",
-    "hash": "sha256-FFZkn/LhOX4qZmziS7tvB0/aXLlq2kJdEivMFHRKXc4="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/ksvg-6.15.0.tar.xz",
+    "hash": "sha256-lVxc6yiHnRAQbLgH9PJZgQxwW7u92vFwrw1WP71YAZc="
   },
   "ktexteditor": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/ktexteditor-6.14.0.tar.xz",
-    "hash": "sha256-uXDWu3YjkhV415CevvGMb3p5jqEcWx4kU/cyFpVndlE="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/ktexteditor-6.15.0.tar.xz",
+    "hash": "sha256-6pp8CEBCJQvfoz6b9fwdxwDVWytf2PKrpkC/+QOS4j0="
   },
   "ktexttemplate": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/ktexttemplate-6.14.0.tar.xz",
-    "hash": "sha256-ZakIqlc+QM+YhKnUKkuNVXS68vQCoZdkzaLMzeJ8iXo="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/ktexttemplate-6.15.0.tar.xz",
+    "hash": "sha256-XGUuuuXTLRuE+kOK2UzGIWIdMeCrz+87ClEaWG1peoQ="
   },
   "ktextwidgets": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/ktextwidgets-6.14.0.tar.xz",
-    "hash": "sha256-TiTm2kd+CND3FVLwgSBlFvzZq0pZPPN9d+vWkIVrdrU="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/ktextwidgets-6.15.0.tar.xz",
+    "hash": "sha256-4TSUHvmJYikla65pebx8En+dybh5RIs2mky2siYEJkk="
   },
   "kunitconversion": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kunitconversion-6.14.0.tar.xz",
-    "hash": "sha256-0H1g7CxcISRvOqn4ngEibghMkP6ZtisItlGTPDEc8I0="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kunitconversion-6.15.0.tar.xz",
+    "hash": "sha256-QTsCVNUeNXFx1B8csWJivkV3X7lKauXCaTT7X/ANKvg="
   },
   "kuserfeedback": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kuserfeedback-6.14.0.tar.xz",
-    "hash": "sha256-JKzW0rhYK91q6b/KlyeKlnY+4YSmzey8Dc1k/U/COLI="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kuserfeedback-6.15.0.tar.xz",
+    "hash": "sha256-DB6tibqY96otPkJ2IKNlzU8cnKMCUO7Gr7T5D+wYf4M="
   },
   "kwallet": {
-    "version": "6.14.1",
-    "url": "mirror://kde/stable/frameworks/6.14/kwallet-6.14.1.tar.xz",
-    "hash": "sha256-70gr4tUhH3EdV4qh0fN/ceZBpqUv034RMn4ZkV/UISc="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kwallet-6.15.0.tar.xz",
+    "hash": "sha256-/brETCUlsS4ks7pZcZEqL/2R/f6nnDoSS86JYhc1iTw="
   },
   "kwidgetsaddons": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kwidgetsaddons-6.14.0.tar.xz",
-    "hash": "sha256-YCcgvD6Gy6I4Tw9F4WyFJKGXR5aj1bfFwe2Q52jPEh8="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kwidgetsaddons-6.15.0.tar.xz",
+    "hash": "sha256-I1V+g9pdSb8XIqrQeEYBWh/OzBCnA0KsnLVLes/4hDU="
   },
   "kwindowsystem": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kwindowsystem-6.14.0.tar.xz",
-    "hash": "sha256-ZiX31aRsucciibyqpl7nRFCmceTb9u6+/HcmUPJM8qY="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kwindowsystem-6.15.0.tar.xz",
+    "hash": "sha256-OdarY75X7UTDz8YTG6jlBzqfkqXye8WPY4sHndBj5MA="
   },
   "kxmlgui": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/kxmlgui-6.14.0.tar.xz",
-    "hash": "sha256-X5o10WjlvoXEPlZvh79xCMGOOhlCDh2TebST4oiAkUs="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/kxmlgui-6.15.0.tar.xz",
+    "hash": "sha256-QM6NRy0XGoGYBq8NWmjD+R1Za1rotLKcRlkqCXjXwwU="
   },
   "modemmanager-qt": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/modemmanager-qt-6.14.0.tar.xz",
-    "hash": "sha256-wfA6TfGMKMQlQLpZ2fm5li1Z9AdM32hrx4fi/1lXg9k="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/modemmanager-qt-6.15.0.tar.xz",
+    "hash": "sha256-LtXe1N285weMXuHylVM8CVFRpWIlYUhIVnTwqeOTLmE="
   },
   "networkmanager-qt": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/networkmanager-qt-6.14.0.tar.xz",
-    "hash": "sha256-DDkr30+N2F8UQfZbqTHY9JVBxVZ/I1DHjnsSFDTDsSY="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/networkmanager-qt-6.15.0.tar.xz",
+    "hash": "sha256-rEF4Y0KxBv50V9QU4teSicbXINz6pYwnHFDI5KdUs5s="
   },
   "prison": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/prison-6.14.0.tar.xz",
-    "hash": "sha256-tQRUqwoNeJGsH5tsTk4AzNMmm61jCmo5L0EMTiUv+2Q="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/prison-6.15.0.tar.xz",
+    "hash": "sha256-ND8dvIL+b92q0IuTpgBI7RGgDFyX+yswQw1xmdYU378="
   },
   "purpose": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/purpose-6.14.0.tar.xz",
-    "hash": "sha256-3Z8juvTEpE8ccffTsL/n+/vN2iAC101LSc2EYxrImek="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/purpose-6.15.0.tar.xz",
+    "hash": "sha256-0cDJSmpsoR4txEdDHQBeEac97DNpK+9hmwuXu1JfxJ4="
   },
   "qqc2-desktop-style": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/qqc2-desktop-style-6.14.0.tar.xz",
-    "hash": "sha256-lgSzXLVTlhxGRt3KaeIH30L/etnj4WCDh/+SPY2fPP8="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/qqc2-desktop-style-6.15.0.tar.xz",
+    "hash": "sha256-q+Kq/QTra3AHdspXZOuFz4cFqYdiTLoYlBOTpnwhUQo="
   },
   "solid": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/solid-6.14.0.tar.xz",
-    "hash": "sha256-AJlvBjR4hj/mG5AtIMlsnrT0rEM1Plm3ebRm+mKxqMQ="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/solid-6.15.0.tar.xz",
+    "hash": "sha256-YIstOtmHNpcYov6KX6e3HHX6pRog6v9bprDt8OXru0o="
   },
   "sonnet": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/sonnet-6.14.0.tar.xz",
-    "hash": "sha256-oN5kwTLAjUmGsA3p7o4plhWtUACLFOJpEPzvytc0r9M="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/sonnet-6.15.0.tar.xz",
+    "hash": "sha256-D3xzFa+68sj32JjUqWDFu6uFHmUzj3mu5U926SUjSIY="
   },
   "syndication": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/syndication-6.14.0.tar.xz",
-    "hash": "sha256-FOWsb2MtwwIvajK5yOW9AIlr3aX62FhXRQI7JTlWGhk="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/syndication-6.15.0.tar.xz",
+    "hash": "sha256-jWreiBIpWp05eKwbLNRswPsYGcWYABViWChR2UQu4Bo="
   },
   "syntax-highlighting": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/syntax-highlighting-6.14.0.tar.xz",
-    "hash": "sha256-39wCWslop9DLQwgm5U8+lrTKh5jP9LXfffST4tDk37w="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/syntax-highlighting-6.15.0.tar.xz",
+    "hash": "sha256-eySQ5rplb9hZdNl3au3oKKCkUOtE6teWnUhO2UhsdMw="
   },
   "threadweaver": {
-    "version": "6.14.0",
-    "url": "mirror://kde/stable/frameworks/6.14/threadweaver-6.14.0.tar.xz",
-    "hash": "sha256-qPcffml1Hjbbx/zpWB9VtmhEvGjfavLoqUwiyP6YcK4="
+    "version": "6.15.0",
+    "url": "mirror://kde/stable/frameworks/6.15/threadweaver-6.15.0.tar.xz",
+    "hash": "sha256-GuDlkxgsJeyKnuhXd6t2e2w3sPfnpoUdS21Jv+A9odA="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index b9d56e3d7c95..a8efae02fd77 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,337 +1,347 @@
 {
+  "aurorae": {
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/aurorae-6.4.0.tar.xz",
+    "hash": "sha256-VjxChfQmhIJW6SyISgWKVy1Z31q5pMi5BzhSJuxKwLI="
+  },
   "bluedevil": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/bluedevil-6.3.5.tar.xz",
-    "hash": "sha256-DuDbv+445vKtvtfRC43vEopPmZvL4p8DXDvUTwpu/LA="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/bluedevil-6.4.0.tar.xz",
+    "hash": "sha256-8yb1EFCmDqwRNlKeFojg3ZAL1brP3cDn3ZQbLXV2rrk="
   },
   "breeze": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-6.3.5.tar.xz",
-    "hash": "sha256-WAPY49Tt994m4t8h7ChmK2EaC8pQXDm5kcd2PbpgJqs="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/breeze-6.4.0.tar.xz",
+    "hash": "sha256-z9s48KTixCjpylpf0SQAtoBKvN1TWbY2+lMno1Eh6GY="
   },
   "breeze-grub": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-grub-6.3.5.tar.xz",
-    "hash": "sha256-+VsB3HrZdRz9nB78eqSbNCkfkxtWJUXhuwBg3kCzoEY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/breeze-grub-6.4.0.tar.xz",
+    "hash": "sha256-syzAxAqtGM7tbowlxlTc/ELUbd2Zm8oFBKCSlZhvYwI="
   },
   "breeze-gtk": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-gtk-6.3.5.tar.xz",
-    "hash": "sha256-spJicqyQjcDBIXWTMzFs/lVnxZHZdXJOLUUxFBUHWA0="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/breeze-gtk-6.4.0.tar.xz",
+    "hash": "sha256-WFJjJxTE17d1SBUe9efe2t7TMfbpARGxbdcQ4Bu6j60="
   },
   "breeze-plymouth": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/breeze-plymouth-6.3.5.tar.xz",
-    "hash": "sha256-/3GTud0REb1ZsYEHyau0ov3nBj2MZkT15OcFHc3HsZU="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/breeze-plymouth-6.4.0.tar.xz",
+    "hash": "sha256-S1DBCbItJbH7YT/K5Qq+NbEAuQgyaudqPdgydMoPTPI="
   },
   "discover": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/discover-6.3.5.tar.xz",
-    "hash": "sha256-CCLh+uB4oA4ylbV44AVNHgmNrKdddedpxMGtqTfws6A="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/discover-6.4.0.tar.xz",
+    "hash": "sha256-CfsdY6puw61W5gb0i24Q1Z7rN9m1J+VKIRtKedblIkI="
   },
   "drkonqi": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/drkonqi-6.3.5.tar.xz",
-    "hash": "sha256-0Mk/D8G0IDtiRdOi9OnIXUFhVw0UoU2B7tWk69Wt/80="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/drkonqi-6.4.0.tar.xz",
+    "hash": "sha256-BGqJ475WIGBu2tlF6/L1KHWlytZ0A8Ha86G/5ShoPqI="
   },
   "flatpak-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/flatpak-kcm-6.3.5.tar.xz",
-    "hash": "sha256-H+8vTOZjpnlr0gWmumjGcnbXzjN72uKW/mO4iZDt/zA="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/flatpak-kcm-6.4.0.tar.xz",
+    "hash": "sha256-KCw6dSf4sdsTLaB992jXLFK7yj4n8iFvS6ahcx3QTeI="
   },
   "kactivitymanagerd": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kactivitymanagerd-6.3.5.tar.xz",
-    "hash": "sha256-FUR351a/7aqUFZyIbA1t1jvHCcHzvMisxJhMiPfDP9U="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kactivitymanagerd-6.4.0.tar.xz",
+    "hash": "sha256-zVaf4lsNZwHDMOCPw+3lfVf/guluxtNH51dbsy+qurs="
   },
   "kde-cli-tools": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kde-cli-tools-6.3.5.tar.xz",
-    "hash": "sha256-8EekZ1bIgvk5LGTj5irQmKsY838fNb38YggrFKemkDc="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kde-cli-tools-6.4.0.tar.xz",
+    "hash": "sha256-T06+18F6JQecVO8DGSmsVdZ3es089ZXKY0P00KTwC6k="
   },
   "kde-gtk-config": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kde-gtk-config-6.3.5.tar.xz",
-    "hash": "sha256-RQrbVRLDDEpau6djxPkoYeoYujNM2FohE+3lReFXwjY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kde-gtk-config-6.4.0.tar.xz",
+    "hash": "sha256-ygZtqEJyKAw/1qGBlw2U854Re+yM7pHXGi4lLCFF788="
   },
   "kdecoration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kdecoration-6.3.5.tar.xz",
-    "hash": "sha256-bhVXEPXzp5m0fZBriiphFqlR3uPRkP4VvHJBPKljPwc="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kdecoration-6.4.0.tar.xz",
+    "hash": "sha256-pMyMS8dB0KQj11DO1m4UG5uY/McUaKshDlTaOCFTtYA="
   },
   "kdeplasma-addons": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kdeplasma-addons-6.3.5.tar.xz",
-    "hash": "sha256-J7xDCi1PX/hbAsEgxFr+PgIoflsTvXMOq7jtSE1epLo="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kdeplasma-addons-6.4.0.tar.xz",
+    "hash": "sha256-XwS3FmjLhADglL7Oa7bHRra7k2W8EWk4tm2Kq9hJNVo="
   },
   "kgamma": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kgamma-6.3.5.tar.xz",
-    "hash": "sha256-FgZi3xHwzXzNqpfBbmNFIqsMhuWi1JzhQ4mZ/mWXmSs="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kgamma-6.4.0.tar.xz",
+    "hash": "sha256-IRQh+vjZAB3JNgkv0fTyEVNIWvQ08AcfVdIovRo5xUg="
   },
   "kglobalacceld": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kglobalacceld-6.3.5.tar.xz",
-    "hash": "sha256-92yf9N8PbeDJ7kdcfjV0l/d9JhWnrdCXtmndaLWaaQA="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kglobalacceld-6.4.0.tar.xz",
+    "hash": "sha256-9+Z6c2e2C9RTBVjvkZgN+ha7UA1VFutonrUAQeELDzI="
   },
   "kinfocenter": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kinfocenter-6.3.5.tar.xz",
-    "hash": "sha256-QDVErutgb/s75V2kIT0XEsv5NTTAmC44IErYY+Aa6MM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kinfocenter-6.4.0.tar.xz",
+    "hash": "sha256-TS3q9MH/dv8QDtawfXyxWLoRbEwiG3tfeyVEAoUFRJQ="
   },
   "kmenuedit": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kmenuedit-6.3.5.tar.xz",
-    "hash": "sha256-EsPBJegT+C1XJ68dYmIIMPXdXdWyAkjxYYWR4jXuk0s="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kmenuedit-6.4.0.tar.xz",
+    "hash": "sha256-SuSmetygfhDCR1uaGay9KD0YQKmWu8CE2bGyN8fm74g="
   },
   "kpipewire": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kpipewire-6.3.5.tar.xz",
-    "hash": "sha256-mbYSu+D+P0QFT8VxMeBfwAX2dczAcaCItaDxVNA68vc="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kpipewire-6.4.0.tar.xz",
+    "hash": "sha256-1ZdmWk7lekmT2QjmIVEkKumlo6JedtC6AD85ymhp41o="
   },
   "krdp": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/krdp-6.3.5.tar.xz",
-    "hash": "sha256-aldaFtzFOJbfDIId491JNA8eI8Bhz7Uotrx+NJn/wuY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/krdp-6.4.0.tar.xz",
+    "hash": "sha256-78FnobeNIWoopi/TzJmBhQKGK6hB7/F1k+4VchzhRdU="
   },
   "kscreen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kscreen-6.3.5.tar.xz",
-    "hash": "sha256-cdy3kCFoHY5I2Bm4EOZzboiypGTmsVml9w/pRfqRCiU="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kscreen-6.4.0.tar.xz",
+    "hash": "sha256-5M7giQpTQFMVH6XoU3Ktgukmm5TNPcMytzfDbEcRcn8="
   },
   "kscreenlocker": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kscreenlocker-6.3.5.tar.xz",
-    "hash": "sha256-eW7zTpH5fb6xkAKw/0QA63MtrJHVGEo5m/nlveI2qPY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kscreenlocker-6.4.0.tar.xz",
+    "hash": "sha256-uEAgK6a1vXgyqyEWvu4sjjhvqbhE5tsOQlqEAGtmmPo="
   },
   "ksshaskpass": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ksshaskpass-6.3.5.tar.xz",
-    "hash": "sha256-38BKYTDVjVYfsO6PrioSf4haqOLe4IdznaMEOHlHrY8="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/ksshaskpass-6.4.0.tar.xz",
+    "hash": "sha256-zjx7qfFmOOteA3iCFEioS5oGGSKL6BluVcOV/U10OAY="
   },
   "ksystemstats": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ksystemstats-6.3.5.tar.xz",
-    "hash": "sha256-4v2Lo/0K4P+RCz/Zb2F1adG/sAwnloaf61+PszTvQ1U="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/ksystemstats-6.4.0.tar.xz",
+    "hash": "sha256-4PiFWk25FQgGa52lEI3bzki7rdpku5ZlOsL7MS/BRo4="
   },
   "kwallet-pam": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwallet-pam-6.3.5.tar.xz",
-    "hash": "sha256-qUOpVXVE2Opr3ibsFlw+yLfAKoF7bnxAbFV67iaaPN4="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwallet-pam-6.4.0.tar.xz",
+    "hash": "sha256-RQ5Na4BMWX61EVkADhk2iJJuTYIlrhmhYn4l0R/ri14="
   },
   "kwayland": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwayland-6.3.5.tar.xz",
-    "hash": "sha256-D8Hw7N1TDlKExs8NHO1IRRQyKEvGXG5NhXihOgnf970="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwayland-6.4.0.tar.xz",
+    "hash": "sha256-CmSafVAjcCLJsMDz798qe/vreU43zzdcohkOZLXR2x8="
   },
   "kwayland-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwayland-integration-6.3.5.tar.xz",
-    "hash": "sha256-iVnwHXG9zZ3eMsSt6GP1SNeSAyZ/R/gmR8qP+nN2iX4="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwayland-integration-6.4.0.tar.xz",
+    "hash": "sha256-olIYm9HKCRWbtweBb/nVUqWzAJMpyTCg6YN3KEvw8Rw="
   },
   "kwin": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwin-6.3.5.tar.xz",
-    "hash": "sha256-1xzay6s1+BOeeZ/gATJI9o6AK6UWQRtEbV1mwwvX5ew="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwin-6.4.0.tar.xz",
+    "hash": "sha256-DTSSMXpxmmRb8ok/ysIbspeWBrrzcDYQ5Va1961U3mo="
+  },
+  "kwin-x11": {
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwin-x11-6.4.0.tar.xz",
+    "hash": "sha256-dtfAGOtu5lcpLIkquc50CYKQ7uB8P9+p18UxSX2OW3c="
   },
   "kwrited": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/kwrited-6.3.5.tar.xz",
-    "hash": "sha256-JijIieIDhUmdxqC5lbuNIffSXX/+pNfrvh5EZdaWZm8="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/kwrited-6.4.0.tar.xz",
+    "hash": "sha256-ZCxWdKsNlcoKQtbRstrKtf+/wGcZgZUo+iUVPGimRUo="
   },
   "layer-shell-qt": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/layer-shell-qt-6.3.5.tar.xz",
-    "hash": "sha256-cGLKDlDczpfdEdit8bhtSfHFZCPyNB3Os+pA3EggbiU="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/layer-shell-qt-6.4.0.tar.xz",
+    "hash": "sha256-K55BM9Cb6Fji7mEHpWir0xoWC0ZlRatLZjEcaDlcd7A="
   },
   "libkscreen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libkscreen-6.3.5.tar.xz",
-    "hash": "sha256-Wl0Uus/smwWRwebW4U85jmlDZsH/Lzj24M11LtqRueM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/libkscreen-6.4.0.tar.xz",
+    "hash": "sha256-4kBHbhXFfoWnkQf++9zLBwgoiaSUtXqlx8Tm8gjpEho="
   },
   "libksysguard": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libksysguard-6.3.5.tar.xz",
-    "hash": "sha256-NsAfjIIYwXUGLooNssB8o5q+rDT8YtfmtIGU8FO8NSM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/libksysguard-6.4.0.tar.xz",
+    "hash": "sha256-v9C695c0B0RAk+E6XOKzEM7lhuO7xdThB4W8Gg1FpmM="
   },
   "libplasma": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/libplasma-6.3.5.tar.xz",
-    "hash": "sha256-UBLIPS2iZd6WBwm08hOPOXiqROH7K7DWs++V3pjm6uQ="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/libplasma-6.4.0.tar.xz",
+    "hash": "sha256-/4bw2QYlS7yfkQfzg7Gfu1un2yQ/q38tfSeP6DFGNUw="
   },
   "milou": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/milou-6.3.5.tar.xz",
-    "hash": "sha256-vPTHP2I/oFEL0YXmHk5VsnX9yIpOXdMRheC3I2ZvyPo="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/milou-6.4.0.tar.xz",
+    "hash": "sha256-7SWKx4tH2O7oFxOIq8EtxzuvP+gkK8EZpqMUMdfbPzA="
   },
   "ocean-sound-theme": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/ocean-sound-theme-6.3.5.tar.xz",
-    "hash": "sha256-5qsu8Sujks2tvE+hBDpKHVQZthd6CGgi9ox6W1IXmMM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/ocean-sound-theme-6.4.0.tar.xz",
+    "hash": "sha256-r6ZyqRyuqaNPn+aZA7/02M+ZsWOT21LVRvq+K1uOp3M="
   },
   "oxygen": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/oxygen-6.3.5.tar.xz",
-    "hash": "sha256-el8Gp0xF7amZqW+OtbLW5Yvqk8OX3xSEtIkoZ32v1z0="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/oxygen-6.4.0.tar.xz",
+    "hash": "sha256-p29NbjoPnvZzq3W3sULfUTbYevHwlMz63Svm5s5sLCQ="
   },
   "oxygen-sounds": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/oxygen-sounds-6.3.5.tar.xz",
-    "hash": "sha256-QFjwO+89nHNKZ5qvbmDO6y6EUAcHi0tlSh88kNKCLlY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/oxygen-sounds-6.4.0.tar.xz",
+    "hash": "sha256-Wz1d8nOQ7ggmCWSypo1Zl/L1B9F1MRRg+6Gs6kFNyFI="
   },
   "plasma-activities": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-6.3.5.tar.xz",
-    "hash": "sha256-7uVaTt4tl3+R2lp/3tbdIa6mwu5PXZ3xFoJwqNYdGfo="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-activities-6.4.0.tar.xz",
+    "hash": "sha256-Go8DS7iVx1d5jFvoeiDbVGlvRe7ePXG4uBXPZmz864w="
   },
   "plasma-activities-stats": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-activities-stats-6.3.5.tar.xz",
-    "hash": "sha256-ZU+sklcd7L2lG9yf7bjA4+X3DXQvcQkZhMELE38cxG4="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-activities-stats-6.4.0.tar.xz",
+    "hash": "sha256-kxNliQbYG/KW2emKwZeQuD6Ii6ifESPGKwpy+TjyjuY="
   },
   "plasma-browser-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-browser-integration-6.3.5.tar.xz",
-    "hash": "sha256-/+EdOQ8xEtvmfxx9vIAAodQUdJrpxn/np5SJ8grjwko="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-browser-integration-6.4.0.tar.xz",
+    "hash": "sha256-FH4LixBeR8o/xpTdLYbsvqp8PDFdi/PaDUtuNagp56Q="
   },
   "plasma-desktop": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-desktop-6.3.5.tar.xz",
-    "hash": "sha256-BH956THyCUNUsYTUsfypFUpzLHSYvxhxqAECB/gCn5o="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-desktop-6.4.0.tar.xz",
+    "hash": "sha256-GOEUAzwYLSY8k39bxBeTJSkx3NrCKwTUnTOgEJuyrrI="
   },
   "plasma-dialer": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-dialer-6.3.5.tar.xz",
-    "hash": "sha256-sbuKAI+g4w1TGTAdppr5et2Uus5OUEkXBmpxMUDBt1M="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-dialer-6.4.0.tar.xz",
+    "hash": "sha256-pyPbCGLDWhw48Fn8zs8rUECrOiv/+gHPY7fh+yUh45A="
   },
   "plasma-disks": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-disks-6.3.5.tar.xz",
-    "hash": "sha256-6vMIr/1yB+6FRK55yZ03a/f56J4iiwE71xavnFMNb80="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-disks-6.4.0.tar.xz",
+    "hash": "sha256-lMle0b1JREjIHjU2Dci0muBazsExZR7IFxb0pSIY6pA="
   },
   "plasma-firewall": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-firewall-6.3.5.tar.xz",
-    "hash": "sha256-cj7lwTHUmlocJYoPAFtSsrww+Jq1DcJWRC8RS+RO+fQ="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-firewall-6.4.0.tar.xz",
+    "hash": "sha256-8MCE2Yxff3Kjc1X9vN/nwv8CBe0kAJAUQGqSRNZIRoU="
   },
   "plasma-integration": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-integration-6.3.5.tar.xz",
-    "hash": "sha256-25RRAKxGG5vgG6N069BHwwm08HdmaMpXBWCHAJTQkRo="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-integration-6.4.0.tar.xz",
+    "hash": "sha256-pxhoIFKN72+Ie2Qu+nv7TE4UjRTmXvCreH/DWmLigdA="
   },
   "plasma-mobile": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-mobile-6.3.5.tar.xz",
-    "hash": "sha256-Bnxd7xZOqMU0qRD7V7TdabHIOmh3l17+vht7J0BF9Jc="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-mobile-6.4.0.tar.xz",
+    "hash": "sha256-1m4fkOvV+ZPueDW3+K6suq0VtB5W3wqyq65Ve0Ck2Dg="
   },
   "plasma-nano": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-nano-6.3.5.tar.xz",
-    "hash": "sha256-/qNsyIFyyGmfbGQ82umgH5JAinaUKiPrVld9zw/DjV8="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-nano-6.4.0.tar.xz",
+    "hash": "sha256-gF400TsjLpf5D3pU/DnLx5qU2ZZ83e3t4GAgKD4+n/E="
   },
   "plasma-nm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-nm-6.3.5.tar.xz",
-    "hash": "sha256-FAHNOR5oTLkaKtyJ4CWlKEVctoPM3PFSpgVwEpM2I/k="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-nm-6.4.0.tar.xz",
+    "hash": "sha256-JZC7gTpX7UEdNwfrrUuo4tvE7V2DC/I1R/loYpcV1Tc="
   },
   "plasma-pa": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-pa-6.3.5.tar.xz",
-    "hash": "sha256-pm//c61ZxH0KDE8axDSa+81Td+eSjt1oSfWn5OEcAZg="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-pa-6.4.0.tar.xz",
+    "hash": "sha256-exm0FHhwiDWhWASU5VIYA7ybeUdLUO0ev5MYog4e0ag="
   },
   "plasma-sdk": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-sdk-6.3.5.tar.xz",
-    "hash": "sha256-cOBH/yxXURTLs254LD4EWyUyWoDY/XpAG9gVjD+ynNM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-sdk-6.4.0.tar.xz",
+    "hash": "sha256-s/ExaxY7tearhpcDBuZjdgrpOBSkPtQ/Ky92ESisKIU="
   },
   "plasma-systemmonitor": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-systemmonitor-6.3.5.tar.xz",
-    "hash": "sha256-cudaSypUb+mGlOWySQUOM1i6rgscOSV6D9pyBqZ3phA="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-systemmonitor-6.4.0.tar.xz",
+    "hash": "sha256-lDac1svv9f+vNgXudmDqSqoD2VkoKw8g1lmpU64tl1o="
   },
   "plasma-thunderbolt": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-thunderbolt-6.3.5.tar.xz",
-    "hash": "sha256-RHLy64VCp5dq4c3aAC1CIBmhFm3r6QIYCneImpAkhD8="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-thunderbolt-6.4.0.tar.xz",
+    "hash": "sha256-w92KudTZFGkp87OWftV/ZpXQpW+Q8oGWTRzwTa9uXI4="
   },
   "plasma-vault": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-vault-6.3.5.tar.xz",
-    "hash": "sha256-psyOrngWcfYtRl3J7EU2BECaJKXJqRyivQKRIrfQHnM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-vault-6.4.0.tar.xz",
+    "hash": "sha256-zdDtq+GiFchWaMRzSfOsju2VpGG71WTWfsjfIXDq52w="
   },
   "plasma-welcome": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-welcome-6.3.5.tar.xz",
-    "hash": "sha256-fuRzKbKUZUm36lPKE8LUpZLSmh7mO5Lo73sF3Dd8cMY="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-welcome-6.4.0.tar.xz",
+    "hash": "sha256-Lw08NImQOoZYa4Otb7UrwVLhtFnkq+yC/wIrUbjStDY="
   },
   "plasma-workspace": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-6.3.5.tar.xz",
-    "hash": "sha256-f1CPbKJ9fWFe7ieRndCw+U0Wi6gcOk1UOWgEa8y3h/I="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-workspace-6.4.0.tar.xz",
+    "hash": "sha256-lh71T3/SHyEvjWMzAPG7BSBSSql5TkM64avhasBWCys="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma-workspace-wallpapers-6.3.5.tar.xz",
-    "hash": "sha256-ipG/gDePFrEvmiAcclLPC6a5DT43hqNll7OyEV+A23w="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma-workspace-wallpapers-6.4.0.tar.xz",
+    "hash": "sha256-zEs1PLI63zJos4sVxvb70lpjd0tJgkaPgORQ9gDTkwI="
   },
   "plasma5support": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plasma5support-6.3.5.tar.xz",
-    "hash": "sha256-6CVJ3gQ+i++iFWrYHK98eoFRkUnNeqgE/9YCoMSlSL4="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plasma5support-6.4.0.tar.xz",
+    "hash": "sha256-OuNktBqGjQ/ZlHxTs9iHI5OLsIA/H4Yphfkztslz6EM="
   },
   "plymouth-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/plymouth-kcm-6.3.5.tar.xz",
-    "hash": "sha256-ZvD+YUe70EACAzec0xIDs2ZC2Pe64Px5AGjpWFN/h00="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/plymouth-kcm-6.4.0.tar.xz",
+    "hash": "sha256-WW0OK4QQbLkS1Poo38mmLPppMAEPJ7aPw0ph2TQSWVM="
   },
   "polkit-kde-agent-1": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/polkit-kde-agent-1-6.3.5.tar.xz",
-    "hash": "sha256-WAcbNSmlO2yZ8aKrUbRSxxusAtH0RW60sBScm8m9W6A="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/polkit-kde-agent-1-6.4.0.tar.xz",
+    "hash": "sha256-qKtd9qseoF5j7wjrvlNuE5PU9tbdSylzBWGfweh1FcU="
   },
   "powerdevil": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/powerdevil-6.3.5.tar.xz",
-    "hash": "sha256-ppiD1hVuemd8jRy1zZFaieJGaSdO8ZZtXZzrMTJQ2lM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/powerdevil-6.4.0.tar.xz",
+    "hash": "sha256-0K1Uy21MzznA1bfwx98vUbyZ/9P9bKdTjtP0HfxPZ34="
   },
   "print-manager": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/print-manager-6.3.5.tar.xz",
-    "hash": "sha256-dxUfOVrZHtprZE62yH/iib4ZjqtBwDnmC9uzsW1VmsE="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/print-manager-6.4.0.tar.xz",
+    "hash": "sha256-KrsouJRLPkxIQTyzG1TgeMn6jR/YwRWmFQcxA52Sy/0="
   },
   "qqc2-breeze-style": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/qqc2-breeze-style-6.3.5.tar.xz",
-    "hash": "sha256-MHqit3HhWFHXAWmah3TrSCYaoRewv/+dqBwzlPuNS+o="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/qqc2-breeze-style-6.4.0.tar.xz",
+    "hash": "sha256-S+kIS9VZdE2Awgs4k8K7tE3Bk/2TJPTbjSf2rQl++kw="
   },
   "sddm-kcm": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/sddm-kcm-6.3.5.tar.xz",
-    "hash": "sha256-tJBj8KKKPkLbpsbe5nWj1TPXJ8M/Q76JEPZAa1x9CNI="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/sddm-kcm-6.4.0.tar.xz",
+    "hash": "sha256-N4t+twvSPMm7ZUs2a4X7YVgkdqvECIYRU0vDyJGPa/I="
   },
   "spacebar": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/spacebar-6.3.5.tar.xz",
-    "hash": "sha256-r5hOC4wDgLdPeL/2+UbXzmhtMSa+ylTV7oXvcRRRrXM="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/spacebar-6.4.0.tar.xz",
+    "hash": "sha256-LHSJ/AczyJjSTexA0fuOUHFAMcJkFPaCYma9PJnAFYA="
   },
   "spectacle": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/spectacle-6.3.5.tar.xz",
-    "hash": "sha256-3vyxsuooW+jF2cnt44mmYo4Lzl2Z0JFs6SWGVSOe8WA="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/spectacle-6.4.0.tar.xz",
+    "hash": "sha256-cxdWeX6+/p9evbYymwz0zdX2wWmq8WpYwpQF/5emprA="
   },
   "systemsettings": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/systemsettings-6.3.5.tar.xz",
-    "hash": "sha256-3Qu1QUBb7RVHRjPNitkKme/MdjuSPaYPtAtpLCrW5Iw="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/systemsettings-6.4.0.tar.xz",
+    "hash": "sha256-TDhVGapA6Q3LCxoLBw0zE/2e1fszyWPqVFnOXTFpLz8="
   },
   "wacomtablet": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/wacomtablet-6.3.5.tar.xz",
-    "hash": "sha256-fXAzHewvgLLFZOeIGyX2Ka36Uu/Hr2DfmhVHnrUy8Lc="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/wacomtablet-6.4.0.tar.xz",
+    "hash": "sha256-c3FmxmiOSOIdTaNp3C83yG/kjx6rv4ndjPJ4WeGiltk="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.3.5",
-    "url": "mirror://kde/stable/plasma/6.3.5/xdg-desktop-portal-kde-6.3.5.tar.xz",
-    "hash": "sha256-DCvcVypvQO5F0b2gkO10JVGwyjSMRpuhRw+HRTlabPg="
+    "version": "6.4.0",
+    "url": "mirror://kde/stable/plasma/6.4.0/xdg-desktop-portal-kde-6.4.0.tar.xz",
+    "hash": "sha256-ANt7FVEUaw2pEHi/VAyir1bJ0g+fJUaeJYOdCUVams4="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix
index bba43b3bc411..02885eb947ff 100644
--- a/pkgs/kde/lib/mk-kde-derivation.nix
+++ b/pkgs/kde/lib/mk-kde-derivation.nix
@@ -6,6 +6,8 @@ self:
   cmake,
   ninja,
   qt6,
+  python3,
+  python3Packages,
 }:
 let
   dependencies = (lib.importJSON ../generated/dependencies.json).dependencies;
@@ -54,6 +56,7 @@ let
 
       # FIXME: typo lol
       "ICS" = lib.licenses.isc;
+      "BSD-2-Clauses" = lib.licenses.bsd2;
       "BSD-3-clause" = lib.licenses.bsd3;
       "BSD-3-Clauses" = lib.licenses.bsd3;
 
@@ -73,7 +76,7 @@ let
       None = null;
     };
 
-  moveDevHook = makeSetupHook { name = "kf6-move-dev-hook"; } ./move-dev-hook.sh;
+  moveOutputsHook = makeSetupHook { name = "kf6-move-outputs-hook"; } ./move-outputs-hook.sh;
 in
 {
   pname,
@@ -84,6 +87,7 @@ in
   extraPropagatedBuildInputs ? [ ],
   extraCmakeFlags ? [ ],
   excludeDependencies ? [ ],
+  hasPythonBindings ? false,
   ...
 }@args:
 let
@@ -119,15 +123,30 @@ let
       "out"
       "dev"
       "devtools"
-    ];
+    ] ++ lib.optionals hasPythonBindings [ "python" ];
 
-    nativeBuildInputs = [
-      cmake
-      ninja
-      qt6.wrapQtAppsHook
-      moveDevHook
-    ] ++ extraNativeBuildInputs;
-    buildInputs = [ qt6.qtbase ] ++ extraBuildInputs;
+    nativeBuildInputs =
+      [
+        cmake
+        ninja
+        qt6.wrapQtAppsHook
+        moveOutputsHook
+      ]
+      ++ lib.optionals hasPythonBindings [
+        python3Packages.shiboken6
+        (python3.withPackages (ps: [
+          ps.build
+          ps.setuptools
+        ]))
+      ]
+      ++ extraNativeBuildInputs;
+
+    buildInputs =
+      [ qt6.qtbase ]
+      ++ lib.optionals hasPythonBindings [
+        python3Packages.pyside6
+      ]
+      ++ extraBuildInputs;
 
     # FIXME: figure out what to propagate here
     propagatedBuildInputs = deps ++ extraPropagatedBuildInputs;
@@ -147,6 +166,7 @@ let
     "extraPropagatedBuildInputs"
     "extraCmakeFlags"
     "excludeDependencies"
+    "hasPythonBindings"
     "meta"
   ];
 
diff --git a/pkgs/kde/lib/move-dev-hook.sh b/pkgs/kde/lib/move-dev-hook.sh
deleted file mode 100644
index a49cb91d22f3..000000000000
--- a/pkgs/kde/lib/move-dev-hook.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# shellcheck shell=bash
-# shellcheck disable=SC2154
-
-moveKF6DevTools() {
-    if [ -n "$devtools" ]; then
-        mkdir -p "$devtools"
-        moveToOutput "${qtPluginPrefix}/designer" "$devtools"
-    fi
-}
-
-postInstallHooks+=('moveKF6DevTools')
diff --git a/pkgs/kde/lib/move-outputs-hook.sh b/pkgs/kde/lib/move-outputs-hook.sh
new file mode 100644
index 000000000000..322241da1406
--- /dev/null
+++ b/pkgs/kde/lib/move-outputs-hook.sh
@@ -0,0 +1,18 @@
+# shellcheck shell=bash
+# shellcheck disable=SC2154
+
+moveKF6Outputs() {
+    if [ -n "$devtools" ]; then
+        mkdir -p "$devtools"
+        moveToOutput "${qtPluginPrefix}/designer" "$devtools"
+    fi
+
+    if [ -n "$python" ]; then
+        mkdir -p "$python"
+        moveToOutput 'lib/python*' "$python"
+        moveToOutput 'share/PySide6' "$python"
+        moveToOutput 'include/PySide6' "$python"
+    fi
+}
+
+postInstallHooks+=('moveKF6Outputs')
diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix
index 48355004b761..ac99319ca255 100644
--- a/pkgs/kde/misc/kdiagram/default.nix
+++ b/pkgs/kde/misc/kdiagram/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkKdeDerivation,
   fetchurl,
-  qttools,
   qtsvg,
 }:
 mkKdeDerivation rec {
@@ -14,10 +13,7 @@ mkKdeDerivation rec {
     hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0=";
   };
 
-  extraNativeBuildInputs = [
-    qttools
-    qtsvg
-  ];
+  extraNativeBuildInputs = [ qtsvg ];
 
   meta.license = [ lib.licenses.gpl2Only ];
 }
diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix
index 96c5a4b7b204..ec7cd7b09ea8 100644
--- a/pkgs/kde/misc/kirigami-addons/default.nix
+++ b/pkgs/kde/misc/kirigami-addons/default.nix
@@ -4,7 +4,6 @@
   fetchurl,
   qtdeclarative,
   qt5compat,
-  qttools,
 }:
 mkKdeDerivation rec {
   pname = "kirigami-addons";
@@ -15,9 +14,9 @@ mkKdeDerivation rec {
     hash = "sha256-AAKK5N+Z4lBRg0XqKNnN9J1wDprKxIJzS7UThNoR+UU=";
   };
 
-  extraNativeBuildInputs = [ (qttools.override { withClang = true; }) ];
   extraBuildInputs = [ qtdeclarative ];
   extraPropagatedBuildInputs = [ qt5compat ];
+  propagatedNativeBuildInputs = [ qt5compat ];
 
   meta.license = with lib.licenses; [
     bsd2
diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix
index 2a7c14b9cefd..7a5f32c99868 100644
--- a/pkgs/kde/misc/klevernotes/default.nix
+++ b/pkgs/kde/misc/klevernotes/default.nix
@@ -16,6 +16,8 @@ mkKdeDerivation rec {
     hash = "sha256-WQoeozREN4GsqUC4OlYTrirt+fYa1yeT90RaJxvTH3I=";
   };
 
+  extraNativeBuildInputs = [ qtwebengine ];
+
   extraBuildInputs = [
     qtsvg
     qtwebengine
diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index 2c960ad813e4..1a2676043358 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -9,20 +9,15 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA=";
+    hash = "sha256-2YRlBaUvl72mTq0ZMDK8KVc+wxSB9HO+PFhvW4Mh7Nw=";
   };
 
-  # Backport fix for Qt 6.9
-  # FIXME: remove in next update
-  patches = [
-    (fetchpatch {
-      url = "https://invent.kde.org/libraries/ktextaddons/-/commit/fdbb082aaa0125d60fdf819c9cb95c40bdb98800.patch";
-      hash = "sha256-S+yGXXhZ/OdIgMGgyzofr1BzNV44/Uz/6NAoxdN9wRk=";
-    })
+  extraNativeBuildInputs = [
+    qtspeech
   ];
 
   extraBuildInputs = [
diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix
index 88f278d92986..8823be7d9376 100644
--- a/pkgs/kde/misc/phonon-vlc/default.nix
+++ b/pkgs/kde/misc/phonon-vlc/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkKdeDerivation,
   fetchurl,
-  qttools,
   libvlc,
 }:
 mkKdeDerivation rec {
@@ -14,7 +13,6 @@ mkKdeDerivation rec {
     hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU=";
   };
 
-  extraNativeBuildInputs = [ qttools ];
   extraBuildInputs = [ libvlc ];
 
   cmakeFlags = [
diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix
index 76e57f30b3a5..a9644f4c29d8 100644
--- a/pkgs/kde/misc/phonon/default.nix
+++ b/pkgs/kde/misc/phonon/default.nix
@@ -7,7 +7,6 @@
   pkg-config,
   libpulseaudio,
   qt5compat,
-  qttools,
 }:
 mkKdeDerivation rec {
   pname = "phonon";
@@ -25,10 +24,7 @@ mkKdeDerivation rec {
     qt5compat
   ];
 
-  extraNativeBuildInputs = [
-    pkg-config
-    qttools
-  ];
+  extraNativeBuildInputs = [ pkg-config ];
 
   cmakeFlags = [
     "-DPHONON_BUILD_QT5=0"
diff --git a/pkgs/kde/misc/plasma-wayland-protocols/default.nix b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
new file mode 100644
index 000000000000..0c124dfffd6c
--- /dev/null
+++ b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
@@ -0,0 +1,21 @@
+{
+  lib,
+  mkKdeDerivation,
+  fetchurl,
+}:
+mkKdeDerivation rec {
+  pname = "plasma-wayland-protocols";
+  version = "1.18.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-${version}.tar.xz";
+    hash = "sha256-JWdHJnGtXZifiLUbrvndWTU6Xnw/LtfmuYl1XLkAQjM=";
+  };
+
+  meta.license = with lib.licenses; [
+    bsd3
+    cc0
+    lgpl21Plus
+    mit
+  ];
+}
diff --git a/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch b/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch
new file mode 100644
index 000000000000..39c47d235f59
--- /dev/null
+++ b/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch
@@ -0,0 +1,11 @@
+--- a/src/aurorae.cpp
++++ b/src/aurorae.cpp
+@@ -201,7 +201,7 @@ void Helper::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
diff --git a/pkgs/kde/plasma/aurorae/default.nix b/pkgs/kde/plasma/aurorae/default.nix
new file mode 100644
index 000000000000..03cb5174b4d0
--- /dev/null
+++ b/pkgs/kde/plasma/aurorae/default.nix
@@ -0,0 +1,14 @@
+{
+  mkKdeDerivation,
+  qttools,
+}:
+mkKdeDerivation {
+  pname = "aurorae";
+
+  patches = [
+    # FIXME: upstream
+    ./0001-follow-symlinks.patch
+  ];
+
+  extraBuildInputs = [ qttools ];
+}
diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix
index 85ddce4b0807..865d667f33af 100644
--- a/pkgs/kde/plasma/default.nix
+++ b/pkgs/kde/plasma/default.nix
@@ -1,5 +1,6 @@
 { callPackage }:
 {
+  aurorae = callPackage ./aurorae { };
   bluedevil = callPackage ./bluedevil { };
   breeze = callPackage ./breeze { };
   breeze-grub = callPackage ./breeze-grub { };
@@ -27,6 +28,7 @@
   kwayland = callPackage ./kwayland { };
   kwayland-integration = callPackage ./kwayland-integration { };
   kwin = callPackage ./kwin { };
+  kwin-x11 = callPackage ./kwin-x11 { };
   kwrited = callPackage ./kwrited { };
   layer-shell-qt = callPackage ./layer-shell-qt { };
   libkscreen = callPackage ./libkscreen { };
diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix
index 6bac06517954..d95dbe4e2532 100644
--- a/pkgs/kde/plasma/discover/default.nix
+++ b/pkgs/kde/plasma/discover/default.nix
@@ -15,7 +15,11 @@ mkKdeDerivation {
     ./qml-deps.patch
   ];
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwebview
+  ];
+
   extraBuildInputs = [
     qtwebview
     discount
diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix
index e23fdacdf158..6b23d5c1a326 100644
--- a/pkgs/kde/plasma/kdeplasma-addons/default.nix
+++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix
@@ -5,5 +5,6 @@
 mkKdeDerivation {
   pname = "kdeplasma-addons";
 
+  extraNativeBuildInputs = [ qtwebengine ];
   extraBuildInputs = [ qtwebengine ];
 }
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 2fa1c15f53fe..2c1860db1d88 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -6,9 +6,6 @@
   pkg-config,
   qtwayland,
   freerdp,
-  fetchpatch,
-  wayland,
-  wayland-protocols,
 }:
 mkKdeDerivation {
   pname = "krdp";
@@ -17,18 +14,15 @@ mkKdeDerivation {
     (replaceVars ./hardcode-openssl-path.patch {
       openssl = lib.getExe openssl;
     })
-    (fetchpatch {
-      # support for freerdp3, can be dropped with krdp 6.4
-      url = "https://invent.kde.org/plasma/krdp/-/merge_requests/69.patch";
-      hash = "sha256-5x9JUbFTw/POxBW8G/BOlo/wtcUjPU9J1V/wba1EI/o=";
-    })
   ];
 
-  extraNativeBuildInputs = [ pkg-config ];
-  extraBuildInputs = [
+  extraNativeBuildInputs = [
+    pkg-config
     qtwayland
+  ];
+
+  extraBuildInputs = [
     freerdp
-    wayland
-    wayland-protocols
+    qtwayland
   ];
 }
diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix
index 379e13d561c8..35c7c5d722e9 100644
--- a/pkgs/kde/plasma/kscreen/default.nix
+++ b/pkgs/kde/plasma/kscreen/default.nix
@@ -1,12 +1,24 @@
 {
   mkKdeDerivation,
+  pkg-config,
   qtsensors,
+  qtwayland,
   dbus,
+  wayland-protocols,
 }:
 mkKdeDerivation {
   pname = "kscreen";
 
-  extraBuildInputs = [ qtsensors ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtsensors
+  ];
+
+  extraBuildInputs = [
+    qtsensors
+    qtwayland
+    wayland-protocols
+  ];
 
   postFixup = ''
     substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \
diff --git a/pkgs/kde/plasma/ksystemstats/default.nix b/pkgs/kde/plasma/ksystemstats/default.nix
index 75e6d22f223e..f4ab0c0d6941 100644
--- a/pkgs/kde/plasma/ksystemstats/default.nix
+++ b/pkgs/kde/plasma/ksystemstats/default.nix
@@ -9,6 +9,10 @@
 mkKdeDerivation {
   pname = "ksystemstats";
 
+  patches = [
+    ./helper-path.patch
+  ];
+
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     networkmanager-qt
diff --git a/pkgs/kde/plasma/ksystemstats/helper-path.patch b/pkgs/kde/plasma/ksystemstats/helper-path.patch
new file mode 100644
index 000000000000..17d0c99be053
--- /dev/null
+++ b/pkgs/kde/plasma/ksystemstats/helper-path.patch
@@ -0,0 +1,10 @@
+diff --git a/plugins/gpu/IntelHelperLocation.h.cmake b/plugins/gpu/IntelHelperLocation.h.cmake
+index 6f9ba83..a252c1b 100644
+--- a/plugins/gpu/IntelHelperLocation.h.cmake
++++ b/plugins/gpu/IntelHelperLocation.h.cmake
+@@ -6,4 +6,4 @@
+ 
+ #pragma once
+ 
+-constexpr auto helperLocation = "@KDE_INSTALL_FULL_LIBEXECDIR@/ksystemstats_intel_helper";
++constexpr auto helperLocation = "/run/wrappers/bin/ksystemstats_intel_helper";
diff --git a/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
new file mode 100644
index 000000000000..896c5dcff20b
--- /dev/null
+++ b/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
@@ -0,0 +1,114 @@
+From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel <samuel@dionne-riel.com>
+Date: Tue, 16 Mar 2021 15:03:59 -0400
+Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
+
+Why is this necessary even though -a "$0" is used in the wrapper?
+Because it's completely bypassing argv0! This looks at the executable
+file in-use according to the kernel!
+
+Wrappers cannot affect the `/proc/.../exe` symlink!
+
+Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
+---
+ src/nixos_utils.h     | 41 +++++++++++++++++++++++++++++++++++++++++
+ src/service_utils.h   |  4 +++-
+ src/waylandwindow.cpp |  5 ++++-
+ 3 files changed, 48 insertions(+), 2 deletions(-)
+ create mode 100644 src/nixos_utils.h
+
+diff --git a/src/nixos_utils.h b/src/nixos_utils.h
+new file mode 100644
+index 0000000..726065d
+--- /dev/null
++++ b/src/nixos_utils.h
+@@ -0,0 +1,41 @@
++#ifndef NIXOS_UTILS_H
++#define NIXOS_UTILS_H
++
++// kwin
++// #include <kwinglobals.h>
++
++namespace KWin
++{
++
++static QString unwrapExecutablePath(const QString &in_executablePath)
++{
++    // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
++    // miscellaneous trickeries and mischievous things to make the programs work.
++    // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
++    // It often happens that they conflict.
++    // Here, `kwin` tries to detect the .desktop file for a given process.
++    // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
++    // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
++    // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
++    // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
++    // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
++    // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
++    // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
++
++    // Use a copy of the const string
++    QString executablePath(in_executablePath);
++
++    // While the parts needed are present, "unwrap" one layer of wrapper names.
++    while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
++        // Approximately equivalent to s/-wrapped$//
++        executablePath.remove(executablePath.length() - 8, 8);
++        // Approximately equivalent to s;/\.;/;
++        executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
++    }
++
++    return executablePath;
++}
++
++}// namespace
++
++#endif // NIXOS_UTILS_H
+diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
+index 8a70c1f..475b15d 100644
+--- a/src/utils/serviceutils.h
++++ b/src/utils/serviceutils.h
+@@ -19,6 +19,7 @@
+ #include <QLoggingCategory>
+ //KF
+ #include <KApplicationTrader>
++#include "nixos_utils.h"
+ 
+ namespace KWin
+ {
+@@ -26,8 +27,9 @@ namespace KWin
+ const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
+ const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
+ 
+-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
+ {
++    const QString executablePath = unwrapExecutablePath(in_executablePath);
+     // needed to be able to use the logging category in a header static function
+     static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
+     const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
+diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
+index fd2c0c1..ae8cf96 100644
+--- a/src/waylandwindow.cpp
++++ b/src/waylandwindow.cpp
+@@ -10,6 +10,7 @@
+ #include "screens.h"
+ #include "wayland_server.h"
+ #include "workspace.h"
++#include "nixos_utils.h"
+ 
+ #include <KWaylandServer/display.h>
+ #include <KWaylandServer/clientbuffer.h>
+@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
+ 
+ void WaylandWindow::updateResourceName()
+ {
+-    const QFileInfo fileInfo(surface()->client()->executablePath());
++    const QString in_path = surface()->client()->executablePath();
++    const QString path = unwrapExecutablePath(in_path);
++    const QFileInfo fileInfo(path);
+     if (fileInfo.exists()) {
+         const QByteArray executableFileName = fileInfo.fileName().toUtf8();
+         setResourceClass(executableFileName, executableFileName);
+-- 
+2.32.0
diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix
new file mode 100644
index 000000000000..917ef8ea0d54
--- /dev/null
+++ b/pkgs/kde/plasma/kwin-x11/default.nix
@@ -0,0 +1,42 @@
+{
+  mkKdeDerivation,
+  pkg-config,
+  qtsensors,
+  qtwayland,
+  xorg,
+  libcanberra,
+  libdisplay-info,
+  libgbm,
+  lcms2,
+  python3,
+}:
+mkKdeDerivation {
+  pname = "kwin-x11";
+
+  patches = [
+    ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+  ];
+
+  postPatch = ''
+    patchShebangs src/plugins/strip-effect-metadata.py
+  '';
+
+  extraNativeBuildInputs = [
+    pkg-config
+    python3
+    qtsensors
+    qtwayland
+  ];
+
+  extraBuildInputs = [
+    qtsensors
+    qtwayland
+
+    libgbm
+    lcms2
+    libcanberra
+    libdisplay-info
+
+    xorg.libxcvt
+  ];
+}
diff --git a/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch b/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch
deleted file mode 100644
index efde4f4dcf04..000000000000
--- a/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Mon, 27 Jan 2020 05:31:13 -0600
-Subject: [PATCH 1/3] follow symlinks
-
----
- src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-index 5242cb7..2e4ddae 100644
---- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-+++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -201,7 +201,7 @@ void Helper::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();
--- 
-2.29.2
-
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 0d78ac721cf2..b923c448e72f 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -22,10 +22,6 @@ mkKdeDerivation {
   pname = "kwin";
 
   patches = [
-    # Follow symlinks when searching for aurorae configs
-    # FIXME(later): upstream?
-    ./0001-follow-symlinks.patch
-    # The rest are NixOS-specific hacks
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
     ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
@@ -44,7 +40,10 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     python3
+    qtsensors
+    qtwayland
   ];
+
   extraBuildInputs = [
     qtquick3d
     qtsensors
diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix
index 009b2633b6f7..0a5a12bac047 100644
--- a/pkgs/kde/plasma/layer-shell-qt/default.nix
+++ b/pkgs/kde/plasma/layer-shell-qt/default.nix
@@ -6,6 +6,10 @@
 mkKdeDerivation {
   pname = "layer-shell-qt";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwayland
+  ];
+
   extraBuildInputs = [ qtwayland ];
 }
diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix
index fa969f46a537..dd00b0738975 100644
--- a/pkgs/kde/plasma/libkscreen/default.nix
+++ b/pkgs/kde/plasma/libkscreen/default.nix
@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   qtwayland,
-  qttools,
   jq,
   wayland,
 }:
@@ -9,7 +8,6 @@ mkKdeDerivation {
   pname = "libkscreen";
 
   extraNativeBuildInputs = [
-    qttools
     qtwayland
     jq
     wayland
diff --git a/pkgs/kde/plasma/libksysguard/default.nix b/pkgs/kde/plasma/libksysguard/default.nix
index 5f6ecce54353..e47da4a5fafd 100644
--- a/pkgs/kde/plasma/libksysguard/default.nix
+++ b/pkgs/kde/plasma/libksysguard/default.nix
@@ -10,6 +10,10 @@
 mkKdeDerivation {
   pname = "libksysguard";
 
+  patches = [
+    ./helper-path.patch
+  ];
+
   extraBuildInputs = [
     qtwebchannel
     qtwebengine
diff --git a/pkgs/kde/plasma/libksysguard/helper-path.patch b/pkgs/kde/plasma/libksysguard/helper-path.patch
new file mode 100644
index 000000000000..e75347d589be
--- /dev/null
+++ b/pkgs/kde/plasma/libksysguard/helper-path.patch
@@ -0,0 +1,12 @@
+diff --git a/processcore/plugins/network/networkconstants.h.in b/processcore/plugins/network/networkconstants.h.in
+index f4556252..23559401 100644
+--- a/processcore/plugins/network/networkconstants.h.in
++++ b/processcore/plugins/network/networkconstants.h.in
+@@ -2,6 +2,6 @@
+ 
+ namespace NetworkConstants {
+ 
+-static const QString HelperLocation = QStringLiteral("@KDE_INSTALL_FULL_LIBEXECDIR@/ksysguard/ksgrd_network_helper");
++static const QString HelperLocation = QStringLiteral("/run/wrappers/bin/ksgrd_network_helper");
+ 
+ }
diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix
index 348bd4cb2bc2..f13240876725 100644
--- a/pkgs/kde/plasma/libplasma/default.nix
+++ b/pkgs/kde/plasma/libplasma/default.nix
@@ -9,6 +9,7 @@ mkKdeDerivation {
   pname = "libplasma";
 
   extraNativeBuildInputs = [ pkg-config ];
+
   extraBuildInputs = [
     qtsvg
     qtwayland
diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix
index ca5a7cc22182..766b83c2590d 100644
--- a/pkgs/kde/plasma/plasma-dialer/default.nix
+++ b/pkgs/kde/plasma/plasma-dialer/default.nix
@@ -9,7 +9,11 @@
 mkKdeDerivation {
   pname = "plasma-dialer";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwayland
+  ];
+
   extraBuildInputs = [
     qtwayland
     callaudiod
diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix
index 55c1bb7ee10a..e3831018b00f 100644
--- a/pkgs/kde/plasma/plasma-integration/default.nix
+++ b/pkgs/kde/plasma/plasma-integration/default.nix
@@ -61,6 +61,8 @@ mkKdeDerivation {
     "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui"
   ];
 
+  extraNativeBuildInputs = [ qtwayland ];
+
   extraBuildInputs = [
     qtwayland
     xorg.libXcursor
diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix
index 18de7ba8e59a..870da8b6e8b4 100644
--- a/pkgs/kde/plasma/plasma-mobile/default.nix
+++ b/pkgs/kde/plasma/plasma-mobile/default.nix
@@ -8,11 +8,17 @@
 mkKdeDerivation {
   pname = "plasma-mobile";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtsensors
+    qtwayland
+  ];
+
   extraBuildInputs = [
     qtsensors
     qtwayland
   ];
+
   postFixup = ''
     substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \
       --replace-fail \
diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix
index 3662452bad7b..de21dbed07b3 100644
--- a/pkgs/kde/plasma/plasma-nm/default.nix
+++ b/pkgs/kde/plasma/plasma-nm/default.nix
@@ -16,7 +16,11 @@ mkKdeDerivation {
     })
   ];
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwebengine
+  ];
+
   extraBuildInputs = [
     qtwebengine
     mobile-broadband-provider-info
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index b5a8b5d3657f..cd5aa2615644 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -8,6 +8,7 @@
   lsof,
   pkg-config,
   spirv-tools,
+  qtlocation,
   qtpositioning,
   qtsvg,
   qtwayland,
@@ -42,7 +43,11 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     spirv-tools
+    qtlocation
+    qtpositioning
+    qtwayland
   ];
+
   extraBuildInputs = [
     qtpositioning
     qtsvg
diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix
index c5c71a1beaa2..4c76b11eb58b 100644
--- a/pkgs/kde/plasma/spectacle/default.nix
+++ b/pkgs/kde/plasma/spectacle/default.nix
@@ -7,6 +7,11 @@
 mkKdeDerivation {
   pname = "spectacle";
 
+  extraNativeBuildInputs = [
+    qtwayland
+    qtmultimedia
+  ];
+
   extraBuildInputs = [
     qtwayland
     qtmultimedia
diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
index 0614c0c191d5..cf6aaad08e53 100644
--- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
+++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
@@ -7,7 +7,11 @@
 mkKdeDerivation {
   pname = "xdg-desktop-portal-kde";
 
-  extraNativeBuildInputs = [ pkg-config ];
+  extraNativeBuildInputs = [
+    pkg-config
+    qtwayland
+  ];
+
   extraBuildInputs = [
     qtwayland
     cups
diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix
index 9982c7766d29..092c729a5b5c 100644
--- a/pkgs/os-specific/linux/apfs/default.nix
+++ b/pkgs/os-specific/linux/apfs/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  tag = "0.3.13";
+  tag = "0.3.14";
 in
 stdenv.mkDerivation {
   pname = "apfs";
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     owner = "linux-apfs";
     repo = "linux-apfs-rw";
     rev = "v${tag}";
-    hash = "sha256-PXTyPOZhBeFGXu71Jj46hlrgVemgmYrjHqkTFjTDoTc=";
+    hash = "sha256-bv3WGcIKx5RVj+cQg0U5U1zGPRzjxMlCZmol9QvAmc4=";
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index cb01e684735a..904e459e3351 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation rec {
     mainProgram = "i7z";
     homepage = "https://github.com/DimitryAndric/i7z";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ bluescreen303 ];
     # broken on ARM
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild b/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
index 31e23136528d..76be2c98a706 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
+++ b/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
@@ -35,7 +35,7 @@ _nixos-rebuild() {
     --profile-name -p # name
     --rollback
     --specialisation -c # name
-    --use-remote-sudo
+    --use-sudo
     --no-ssh-tty
     --build-host # host
     --target-host # host
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
index 3e9936d30129..2932a82e84f1 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
@@ -38,7 +38,7 @@
 .br
 .Op Fl -build-host Va host
 .Op Fl -target-host Va host
-.Op Fl -use-remote-sudo
+.Op Fl -sudo
 .Op Fl -no-ssh-tty
 .br
 .Op Fl -verbose | v
@@ -404,7 +404,7 @@ or
 is also set. This is useful when the target-host connection to cache.nixos.org
 is faster than the connection between hosts.
 .
-.It Fl -use-remote-sudo
+.It Fl -sudo
 When set, nixos-rebuild prefixes activation commands that run on the
 .Fl -target-host
 system with
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 74ca23a8b6ca..7b1e99a2f819 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -32,7 +32,7 @@ specialisation=
 imageVariant=
 buildHost=
 targetHost=
-remoteSudo=
+useSudo=
 noSSHTTY=
 verboseScript=
 noFlake=
@@ -170,8 +170,8 @@ while [ "$#" -gt 0 ]; do
         targetHost="$1"
         shift 1
         ;;
-      --use-remote-sudo)
-        remoteSudo=1
+      --sudo | --use-remote-sudo)
+        useSudo=1
         ;;
       --no-ssh-tty)
         noSSHTTY=1
@@ -237,7 +237,7 @@ buildHostCmd() {
 
 targetHostCmd() {
     local c
-    if [[ "${useSudo:-x}" = 1 ]]; then
+    if [[ "${withSudo:-x}" = 1 ]]; then
         c=("sudo")
     else
         c=()
@@ -256,8 +256,8 @@ targetHostSudoCmd() {
         t="-t"
     fi
 
-    if [ -n "$remoteSudo" ]; then
-        useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"
+    if [[ -n "$useSudo" ]]; then
+        withSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"
     else
         # While a tty might not be necessary, we apply it to be consistent with
         # sudo usage, and an experience that is more consistent with local deployment.
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch b/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch
new file mode 100644
index 000000000000..59b9f268e940
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch
@@ -0,0 +1,41 @@
+From 5f9d4458f05c5d9f4b416de867fd9327aba865d5 Mon Sep 17 00:00:00 2001
+From: Dirk-Willem van Gulik <dirkx@redwax.eu>
+Date: Fri, 21 Jan 2022 21:53:49 +0100
+Subject: [PATCH] DEFINE_STACK_OF(EVP_MD) seems to have gone; recreate it. And
+ quell a warning.
+
+---
+ mod_timestamp.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/mod_timestamp.c b/mod_timestamp.c
+index 289d50a..54af7c8 100644
+--- a/mod_timestamp.c
++++ b/mod_timestamp.c
+@@ -41,6 +41,14 @@
+ 
+ #include "mod_ca.h"
+ 
++#ifndef sk_EVP_MD_free
++/* Recent versions of OpenSSL seem to no longer define 
++ * a stack of EVP_MD's. 
++ */
++#include <openssl/safestack.h>
++DEFINE_STACK_OF(EVP_MD)
++#endif
++
+ #define DEFAULT_TIMESTAMP_SIZE 128*1024
+ 
+ module AP_MODULE_DECLARE_DATA timestamp_module;
+@@ -360,7 +368,7 @@ static const char *add_timestamp_digest(cmd_parms *cmd, void *dconf,
+         return apr_psprintf(cmd->pool,
+                 "'%s' could not be recognised as a valid digest.", arg);
+     }
+-    if (!sk_EVP_MD_push(conf->digests, digest)) {
++    if (!sk_EVP_MD_push(conf->digests, (EVP_MD *)digest)) {
+         return apr_psprintf(cmd->pool,
+                 "'%s' could not be added as a valid digest.", arg);
+     }
+-- 
+2.49.0
+
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
index 2de2d5a65b3c..91323c62e7b1 100644
--- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     mod_ca
   ];
 
+  # FIXME: remove after next release after 0.2.3
+  patches = [ ./0001-DEFINE_STACK_OF-EVP_MD-seems-to-have-gone-recreate-i.patch ];
+
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isClang [
       "-Wno-error=int-conversion"
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 4dcc524f01b3..63f408e1f81e 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -7,17 +7,18 @@
 let
   version = "4.3.8";
 in
-(applyPatches {
+applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
     hash = "sha256-08AApylDOz8oExZ0cRaZTgNAuP+1wiLkx0SDhkO2fMM=";
+
+    passthru = {
+      inherit version;
+      yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
+      yarnMissingHashes = null;
+    };
   };
   patches = patches ++ [ ];
-})
-// {
-  inherit version;
-  yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
-  yarnMissingHashes = null;
 }
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 9839b4ca949f..1448fed7faaa 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -188,7 +188,6 @@ stdenv.mkDerivation rec {
     inherit license;
 
     maintainers = with maintainers; [
-      bluescreen303
       offline
     ];
     platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 686ad7eadc74..f1c3cf02c331 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       thoughtpolice
-      bluescreen303
     ];
   };
 }
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ef9cbc751256..266b895abd4b 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -256,115 +256,117 @@ let
             '';
         }
       );
+    in
 
-      server = stdenv.mkDerivation (
-        common
-        // {
-          pname = "mariadb-server";
+    stdenv.mkDerivation (
+      finalAttrs:
+      common
+      // {
+        pname = "mariadb-server";
 
-          nativeBuildInputs = common.nativeBuildInputs ++ [
-            bison
-            boost.dev
-            flex
+        nativeBuildInputs = common.nativeBuildInputs ++ [
+          bison
+          boost.dev
+          flex
+        ];
+
+        buildInputs =
+          common.buildInputs
+          ++ [
+            bzip2
+            lz4
+            lzo
+            snappy
+            xz
+            zstd
+            cracklib
+            judy
+            libevent
+            libxml2
+          ]
+          ++ lib.optional withNuma numactl
+          ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
+          ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
+          ++ lib.optionals withStorageMroonga [
+            kytea
+            libsodium
+            msgpack
+            zeromq
+          ]
+          ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
+
+        propagatedBuildInputs = lib.optional withNuma numactl;
+
+        postPatch = ''
+          substituteInPlace scripts/galera_new_cluster.sh \
+            --replace ":-mariadb" ":-mysql"
+        '';
+
+        cmakeFlags =
+          common.cmakeFlags
+          ++ [
+            "-DMYSQL_DATADIR=/var/lib/mysql"
+            "-DENABLED_LOCAL_INFILE=OFF"
+            "-DWITH_READLINE=ON"
+            "-DWITH_EXTRA_CHARSETS=all"
+            "-DWITH_EMBEDDED_SERVER=${if withEmbedded then "ON" else "OFF"}"
+            "-DWITH_UNIT_TESTS=OFF"
+            "-DWITH_WSREP=ON"
+            "-DWITH_INNODB_DISALLOW_WRITES=ON"
+            "-DWITHOUT_EXAMPLE=1"
+            "-DWITHOUT_FEDERATED=1"
+            "-DWITHOUT_TOKUDB=1"
+          ]
+          ++ lib.optionals withNuma [
+            "-DWITH_NUMA=ON"
+          ]
+          ++ lib.optionals (!withStorageMroonga) [
+            "-DWITHOUT_MROONGA=1"
+          ]
+          ++ lib.optionals (!withStorageRocks) [
+            "-DWITHOUT_ROCKSDB=1"
+          ]
+          ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
+            "-DWITH_ROCKSDB_JEMALLOC=ON"
+          ]
+          ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+            "-DWITH_JEMALLOC=yes"
+          ]
+          ++ lib.optionals stdenv.hostPlatform.isDarwin [
+            "-DPLUGIN_AUTH_PAM=NO"
+            "-DPLUGIN_AUTH_PAM_V1=NO"
+            "-DWITHOUT_OQGRAPH=1"
+            "-DWITHOUT_PLUGIN_S3=1"
           ];
 
-          buildInputs =
-            common.buildInputs
-            ++ [
-              bzip2
-              lz4
-              lzo
-              snappy
-              xz
-              zstd
-              cracklib
-              judy
-              libevent
-              libxml2
-            ]
-            ++ lib.optional withNuma numactl
-            ++ lib.optionals stdenv.hostPlatform.isLinux [ linux-pam ]
-            ++ lib.optional (!stdenv.hostPlatform.isDarwin) mytopEnv
-            ++ lib.optionals withStorageMroonga [
-              kytea
-              libsodium
-              msgpack
-              zeromq
-            ]
-            ++ lib.optionals (lib.versionAtLeast common.version "10.11") [ fmt_11 ];
+        preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+          patchShebangs scripts/mytop.sh
+        '';
 
-          propagatedBuildInputs = lib.optional withNuma numactl;
-
-          postPatch = ''
-            substituteInPlace scripts/galera_new_cluster.sh \
-              --replace ":-mariadb" ":-mysql"
+        postInstall =
+          common.postInstall
+          + ''
+            rm -r "$out"/share/aclocal
+            chmod +x "$out"/bin/wsrep_sst_common
+            rm -f "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
+          ''
+          + lib.optionalString withStorageMroonga ''
+            mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
+          ''
+          + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.4") ''
+            mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
+            mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
+            rm -r "$out"/OFF
           '';
 
-          cmakeFlags =
-            common.cmakeFlags
-            ++ [
-              "-DMYSQL_DATADIR=/var/lib/mysql"
-              "-DENABLED_LOCAL_INFILE=OFF"
-              "-DWITH_READLINE=ON"
-              "-DWITH_EXTRA_CHARSETS=all"
-              "-DWITH_EMBEDDED_SERVER=${if withEmbedded then "ON" else "OFF"}"
-              "-DWITH_UNIT_TESTS=OFF"
-              "-DWITH_WSREP=ON"
-              "-DWITH_INNODB_DISALLOW_WRITES=ON"
-              "-DWITHOUT_EXAMPLE=1"
-              "-DWITHOUT_FEDERATED=1"
-              "-DWITHOUT_TOKUDB=1"
-            ]
-            ++ lib.optionals withNuma [
-              "-DWITH_NUMA=ON"
-            ]
-            ++ lib.optionals (!withStorageMroonga) [
-              "-DWITHOUT_MROONGA=1"
-            ]
-            ++ lib.optionals (!withStorageRocks) [
-              "-DWITHOUT_ROCKSDB=1"
-            ]
-            ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
-              "-DWITH_ROCKSDB_JEMALLOC=ON"
-            ]
-            ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-              "-DWITH_JEMALLOC=yes"
-            ]
-            ++ lib.optionals stdenv.hostPlatform.isDarwin [
-              "-DPLUGIN_AUTH_PAM=NO"
-              "-DPLUGIN_AUTH_PAM_V1=NO"
-              "-DWITHOUT_OQGRAPH=1"
-              "-DWITHOUT_PLUGIN_S3=1"
-            ];
+        CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";
 
-          preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-            patchShebangs scripts/mytop.sh
-          '';
-
-          postInstall =
-            common.postInstall
-            + ''
-              rm -r "$out"/share/aclocal
-              chmod +x "$out"/bin/wsrep_sst_common
-              rm -f "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
-            ''
-            + lib.optionalString withStorageMroonga ''
-              mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
-            ''
-            + lib.optionalString (!stdenv.hostPlatform.isDarwin && lib.versionAtLeast common.version "10.4") ''
-              mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security
-              mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security
-              rm -r "$out"/OFF
-            '';
-
-          CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";
-        }
-      );
-    in
-    server
-    // {
-      inherit client server;
-    };
+        passthru = {
+          inherit client;
+          server = finalAttrs.finalPackage;
+        };
+      }
+    );
 in
 self: {
   # see https://mariadb.org/about/#maintenance-policy for EOLs
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index b496c0569d79..2d6930e34970 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   pcre,
   pcre2,
   jemalloc,
@@ -56,6 +57,24 @@ let
 
       buildFlags = [ "localstatedir=/var/run" ];
 
+      patches =
+        lib.optionals (stdenv.isDarwin && lib.versionAtLeast version "7.7") [
+          # Fix VMOD section attribute on macOS
+          # Unreleased commit on master
+          (fetchpatch2 {
+            url = "https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch";
+            hash = "sha256-T7DIkmnq0O+Cr9DTJS4/rOtg3J6PloUo8jHMWoUZYYk=";
+          })
+          # Fix endian.h compatibility on macOS
+          # PR: https://github.com/varnishcache/varnish-cache/pull/4339
+          ./patches/0001-fix-endian-h-compatibility-on-macos.patch
+        ]
+        ++ lib.optionals (stdenv.isDarwin && lib.versionOlder version "7.6") [
+          # Fix duplicate OS_CODE definitions on macOS
+          # PR: https://github.com/varnishcache/varnish-cache/pull/4347
+          ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
+        ];
+
       postPatch = ''
         substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"
       '';
diff --git a/pkgs/servers/varnish/patches/0001-fix-endian-h-compatibility-on-macos.patch b/pkgs/servers/varnish/patches/0001-fix-endian-h-compatibility-on-macos.patch
new file mode 100644
index 000000000000..1b4f3568781e
--- /dev/null
+++ b/pkgs/servers/varnish/patches/0001-fix-endian-h-compatibility-on-macos.patch
@@ -0,0 +1,43 @@
+From 7a1c7020db85699e0693d637f6e31d49bf9ca3d0 Mon Sep 17 00:00:00 2001
+From: Rui Chen <rui@chenrui.dev>
+Date: Sun, 25 May 2025 23:54:29 -0400
+Subject: [PATCH] libvarnish: Fix endian.h compatibility for macOS builds
+
+Signed-off-by: Rui Chen <rui@chenrui.dev>
+---
+ lib/libvarnish/vsha256.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libvarnish/vsha256.c b/lib/libvarnish/vsha256.c
+index 29f97fe40..541b6e612 100644
+--- a/lib/libvarnish/vsha256.c
++++ b/lib/libvarnish/vsha256.c
+@@ -31,7 +31,14 @@
+ 
+ #include "config.h"
+ 
+-#ifndef __DARWIN_BYTE_ORDER
++#ifdef __APPLE__
++#  include <machine/endian.h>
++#  include <libkern/OSByteOrder.h>
++#  define htobe32(x) OSSwapHostToBigInt32(x)
++#  define htobe64(x) OSSwapHostToBigInt64(x)
++#  define VBYTE_ORDER __DARWIN_BYTE_ORDER
++#  define VBIG_ENDIAN __DARWIN_BIG_ENDIAN
++#else
+ #  include <endian.h>
+ #  ifdef _BYTE_ORDER
+ #    define VBYTE_ORDER	_BYTE_ORDER
+@@ -43,9 +50,6 @@
+ #  else
+ #    define VBIG_ENDIAN	__BIG_ENDIAN
+ #  endif
+-#else
+-#  define VBYTE_ORDER	__DARWIN_BYTE_ORDER
+-#  define VBIG_ENDIAN	__DARWIN_BIG_ENDIAN
+ #endif
+ 
+ #ifndef VBYTE_ORDER
+-- 
+2.49.0
+
diff --git a/pkgs/servers/varnish/patches/0002-fix-duplicate-os-code-definitions-on-macos.patch b/pkgs/servers/varnish/patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
new file mode 100644
index 000000000000..4153e20e08f1
--- /dev/null
+++ b/pkgs/servers/varnish/patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
@@ -0,0 +1,43 @@
+From f56b314408d22252bf62d6cd2e098cf8139bd048 Mon Sep 17 00:00:00 2001
+From: Sander <hey@sandydoo.me>
+Date: Fri, 13 Jun 2025 01:12:59 +0200
+Subject: [PATCH] build: fix duplicate OS_CODE definitions on macOS
+
+`TARGET_OS_MAC` and `__APPLE__` are both true on macOS, which results in
+duplicate definitions for `OS_CODE`.
+
+Upstream removed the check for `TARGET_OS_MAC`, as well as the ancient
+compat code, in
+https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.
+
+This was fixed in varnish >= 7.6 as part of https://github.com/varnishcache/varnish-cache/commit/86df12b6c1ad8208899ea353fdcbea227356fcf8.
+---
+ lib/libvgz/zutil.h | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+diff --git a/lib/libvgz/zutil.h b/lib/libvgz/zutil.h
+index 1c80e3842..294ea2b2d 100644
+--- a/lib/libvgz/zutil.h
++++ b/lib/libvgz/zutil.h
+@@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #  endif
+ #endif
+ 
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ #  define OS_CODE  7
+-#  ifndef Z_SOLO
+-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+-#      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+-#    endif
+-#  endif
+ #endif
+ 
+ #ifdef __acorn
+-- 
+2.49.0
+
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 99c9aabbbbdd..d5b49da0b521 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xwayland";
-  version = "24.1.6";
+  version = "24.1.7";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    hash = "sha256-c35hLKNrvfQVqRFkTrdZLPk4mEaEe0f6RtxwW9dU0tc=";
+    hash = "sha256-99l+JICSh4o/fTxosl2rZSv5cNnmoX0w+/RXquoTnMs=";
   };
 
   postPatch = ''
diff --git a/pkgs/test/build-deno-package/.gitignore b/pkgs/test/build-deno-package/.gitignore
deleted file mode 100644
index cb92b2a7589f..000000000000
--- a/pkgs/test/build-deno-package/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deno/
-node_modules/
-vendor/
diff --git a/pkgs/test/build-deno-package/binaries/default.nix b/pkgs/test/build-deno-package/binaries/default.nix
deleted file mode 100644
index 349bf1263dec..000000000000
--- a/pkgs/test/build-deno-package/binaries/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ nix-gitignore, buildDenoPackage }:
-{
-  with-npm-linux = buildDenoPackage rec {
-    pname = "test-deno-build-binaries-with-npm-${targetSystem}";
-    version = "0.1.0";
-    denoDepsHash = "sha256-k2js/8XsxGVu83rGMJed457orraue8WUZF+JUMMfhVQ=";
-    src = nix-gitignore.gitignoreSource [ ] ./with-npm;
-    binaryEntrypointPath = "./main.ts";
-    targetSystem = "x86_64-linux";
-  };
-  without-npm-linux = buildDenoPackage rec {
-    pname = "test-deno-build-binaries-without-npm-${targetSystem}";
-    version = "0.1.0";
-    denoDepsHash = "sha256-keshKcgawVcuSGNYAIepUrRl7iqpp0ExRJag4aiV18c=";
-    src = nix-gitignore.gitignoreSource [ ] ./without-npm;
-    binaryEntrypointPath = "./main.ts";
-    targetSystem = "x86_64-linux";
-  };
-  # mac =
-  # let
-  #   targetSystem = "aarch64-darwin";
-  #  macpkgs = import ../../../../default.nix  { crossSystem = { config = "arm64-apple-darwin"; };};
-  # in
-  # buildDenoPackage {
-  #   pname = "test-deno-build-binaries-${targetSystem}";
-  #   version = "0.1.0";
-  #   denoDepsHash = "";
-  #   src = nix-gitignore.gitignoreSource [ ] ./.;
-  #   binaryEntrypointPath = "./main.ts";
-  #   denortPackage = macpkgs.denort;
-  #   inherit targetSystem;
-  # };
-}
diff --git a/pkgs/test/build-deno-package/binaries/with-npm/.gitignore b/pkgs/test/build-deno-package/binaries/with-npm/.gitignore
deleted file mode 100644
index cb92b2a7589f..000000000000
--- a/pkgs/test/build-deno-package/binaries/with-npm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deno/
-node_modules/
-vendor/
diff --git a/pkgs/test/build-deno-package/binaries/with-npm/deno.json b/pkgs/test/build-deno-package/binaries/with-npm/deno.json
deleted file mode 100644
index 5e8a1c53d6a2..000000000000
--- a/pkgs/test/build-deno-package/binaries/with-npm/deno.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "binary build",
-  "tasks": {
-      "build": "deno run --allow-all main.ts"
-  },
-  "imports": {
-      "@luca/cases": "jsr:@luca/cases@1.0.0",
-      "@std/cli": "jsr:@std/cli@1.0.17",
-      "cowsay": "npm:cowsay@1.6.0",
-      "cases": "https://deno.land/x/case@2.2.0/mod.ts"
-  },
-  "vendor": true
-}
diff --git a/pkgs/test/build-deno-package/binaries/with-npm/deno.lock b/pkgs/test/build-deno-package/binaries/with-npm/deno.lock
deleted file mode 100644
index 56656abe3767..000000000000
--- a/pkgs/test/build-deno-package/binaries/with-npm/deno.lock
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@luca/cases@1.0.0": "1.0.0",
-    "jsr:@std/cli@1.0.17": "1.0.17",
-    "npm:cowsay@1.6.0": "1.6.0"
-  },
-  "jsr": {
-    "@luca/cases@1.0.0": {
-      "integrity": "b5f9471f1830595e63a2b7d62821ac822a19e16899e6584799be63f17a1fbc30"
-    },
-    "@std/cli@1.0.17": {
-      "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b"
-    }
-  },
-  "npm": {
-    "ansi-regex@3.0.1": {
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
-    },
-    "ansi-regex@5.0.1": {
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles@4.3.0": {
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": [
-        "color-convert"
-      ]
-    },
-    "camelcase@5.3.1": {
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "cliui@6.0.0": {
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dependencies": [
-        "string-width@4.2.3",
-        "strip-ansi@6.0.1",
-        "wrap-ansi"
-      ]
-    },
-    "color-convert@2.0.1": {
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": [
-        "color-name"
-      ]
-    },
-    "color-name@1.1.4": {
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "cowsay@1.6.0": {
-      "integrity": "sha512-8C4H1jdrgNusTQr3Yu4SCm+ZKsAlDFbpa0KS0Z3im8ueag+9pGOf3CrioruvmeaW/A5oqg9L0ar6qeftAh03jw==",
-      "dependencies": [
-        "get-stdin",
-        "string-width@2.1.1",
-        "strip-final-newline",
-        "yargs"
-      ],
-      "bin": true
-    },
-    "decamelize@1.2.0": {
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
-    },
-    "emoji-regex@8.0.0": {
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "find-up@4.1.0": {
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": [
-        "locate-path",
-        "path-exists"
-      ]
-    },
-    "get-caller-file@2.0.5": {
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-stdin@8.0.0": {
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
-    },
-    "is-fullwidth-code-point@2.0.0": {
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
-    },
-    "is-fullwidth-code-point@3.0.0": {
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "locate-path@5.0.0": {
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": [
-        "p-locate"
-      ]
-    },
-    "p-limit@2.3.0": {
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": [
-        "p-try"
-      ]
-    },
-    "p-locate@4.1.0": {
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": [
-        "p-limit"
-      ]
-    },
-    "p-try@2.2.0": {
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "path-exists@4.0.0": {
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "require-directory@2.1.1": {
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "require-main-filename@2.0.0": {
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "set-blocking@2.0.0": {
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-    },
-    "string-width@2.1.1": {
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": [
-        "is-fullwidth-code-point@2.0.0",
-        "strip-ansi@4.0.0"
-      ]
-    },
-    "string-width@4.2.3": {
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": [
-        "emoji-regex",
-        "is-fullwidth-code-point@3.0.0",
-        "strip-ansi@6.0.1"
-      ]
-    },
-    "strip-ansi@4.0.0": {
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dependencies": [
-        "ansi-regex@3.0.1"
-      ]
-    },
-    "strip-ansi@6.0.1": {
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": [
-        "ansi-regex@5.0.1"
-      ]
-    },
-    "strip-final-newline@2.0.0": {
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "which-module@2.0.1": {
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
-    },
-    "wrap-ansi@6.2.0": {
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": [
-        "ansi-styles",
-        "string-width@4.2.3",
-        "strip-ansi@6.0.1"
-      ]
-    },
-    "y18n@4.0.3": {
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
-    "yargs-parser@18.1.3": {
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dependencies": [
-        "camelcase",
-        "decamelize"
-      ]
-    },
-    "yargs@15.4.1": {
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dependencies": [
-        "cliui",
-        "decamelize",
-        "find-up",
-        "get-caller-file",
-        "require-directory",
-        "require-main-filename",
-        "set-blocking",
-        "string-width@4.2.3",
-        "which-module",
-        "y18n",
-        "yargs-parser"
-      ]
-    }
-  },
-  "remote": {
-    "https://deno.land/x/case@2.2.0/camelCase.ts": "b9a4cf361a7c9740ecb75e00b5e2c006bd4e5d40e442d26c5f2760286fa66796",
-    "https://deno.land/x/case@2.2.0/constantCase.ts": "c698fc32f00cd267c1684b1d413d784260d7e7798f2bf506803e418497d839b5",
-    "https://deno.land/x/case@2.2.0/dotCase.ts": "03ae55d5635e6a4ca894a003d9297cd9cd283af2e7d761dd3de13663849a9423",
-    "https://deno.land/x/case@2.2.0/headerCase.ts": "3f6c8ab2ab30a88147326bce28a00d1189ec98ab61c83ab72ce79e852afddc4a",
-    "https://deno.land/x/case@2.2.0/lowerCase.ts": "d75eb55cadfa589f9f2a973924a8a209054477d9574da669410f4d817ab25b41",
-    "https://deno.land/x/case@2.2.0/lowerFirstCase.ts": "b001efbf2d715b53d066b22cdbf8eda7f99aa7108e3d12fb02f80d499bae93d9",
-    "https://deno.land/x/case@2.2.0/mod.ts": "28b0b1329c7b18730799ac05627a433d9547c04b9bfb429116247c60edecd97b",
-    "https://deno.land/x/case@2.2.0/normalCase.ts": "085c8b6f9d69283c8b86f2e504d43278c2be8b7e56a3ed8d4a5f395e398bdc29",
-    "https://deno.land/x/case@2.2.0/paramCase.ts": "a234c9c17dfbaddee647b6571c2c90e8f6530123fed26c4546f4063d67c1609f",
-    "https://deno.land/x/case@2.2.0/pascalCase.ts": "4b3ef0a68173871a821d306d4067e8f72d42aeeef1eea6aeab30af6bfa3d7427",
-    "https://deno.land/x/case@2.2.0/pathCase.ts": "330a34b4df365b0291d8e36158235340131730aae6f6add66962ed2d0fbead4a",
-    "https://deno.land/x/case@2.2.0/sentenceCase.ts": "b312cef147a13b58ffdf3c36bf55b33aa8322c91f4aa9b32318f3911bb92327f",
-    "https://deno.land/x/case@2.2.0/snakeCase.ts": "e5ac1e08532ca397aa3150a0a3255d59f63a186d934e5094a8ffd24cbca7f955",
-    "https://deno.land/x/case@2.2.0/swapCase.ts": "bb03742fcf613f733890680ceca1b39b65ed290f36a317fcd47edd517c4e0e1e",
-    "https://deno.land/x/case@2.2.0/titleCase.ts": "c287131ea2c955e67cdd5cf604de96d31a8e2813305759922b9ed27e3be354e7",
-    "https://deno.land/x/case@2.2.0/types.ts": "8e2bd6edaa27c0d1972c0d5b76698564740f37b4d3787d58d1fb5f48de611e61",
-    "https://deno.land/x/case@2.2.0/upperCase.ts": "6cca267bb04d098bf4abf21e42e60c3e68ede89b12e525643c6b6eff3e10de34",
-    "https://deno.land/x/case@2.2.0/upperFirstCase.ts": "b964c2d8d3a85c78cd35f609135cbde99d84b9522a21470336b5af80a37facbd",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseRegexp.ts": "7d9ff02aad4ab6429eeab7c7353f7bcdd6cc5909a8bd3dda97918c8bbb7621ae",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseUpperRegexp.ts": "292de54a698370f90adcdf95727993d09888b7f33d17f72f8e54ba75f7791787",
-    "https://deno.land/x/case@2.2.0/vendor/nonWordRegexp.ts": "c1a052629a694144b48c66b0175a22a83f4d61cb40f4e45293fc5d6b123f927e"
-  },
-  "workspace": {
-    "dependencies": [
-      "jsr:@luca/cases@1.0.0",
-      "jsr:@std/cli@1.0.17",
-      "npm:cowsay@1.6.0"
-    ]
-  }
-}
diff --git a/pkgs/test/build-deno-package/binaries/with-npm/main.ts b/pkgs/test/build-deno-package/binaries/with-npm/main.ts
deleted file mode 100644
index 0d8b922bac22..000000000000
--- a/pkgs/test/build-deno-package/binaries/with-npm/main.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { camelCase } from "@luca/cases";
-import { say } from "cowsay";
-import { pascalCase } from "cases";
-import { parseArgs } from "@std/cli";
-
-const flags = parseArgs(Deno.args, {
-  string: ["text"],
-});
-
-if (!flags.text) {
-  throw "--text required but not specified";
-}
-
-console.log(camelCase(say({ text: flags.text })));
-console.log(pascalCase(say({ text: flags.text })));
diff --git a/pkgs/test/build-deno-package/binaries/without-npm/.gitignore b/pkgs/test/build-deno-package/binaries/without-npm/.gitignore
deleted file mode 100644
index cb92b2a7589f..000000000000
--- a/pkgs/test/build-deno-package/binaries/without-npm/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deno/
-node_modules/
-vendor/
diff --git a/pkgs/test/build-deno-package/binaries/without-npm/deno.json b/pkgs/test/build-deno-package/binaries/without-npm/deno.json
deleted file mode 100644
index c9a829c9c1ab..000000000000
--- a/pkgs/test/build-deno-package/binaries/without-npm/deno.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "binary build",
-  "tasks": {
-      "build": "deno run --allow-all main.ts"
-  },
-  "imports": {
-      "@luca/cases": "jsr:@luca/cases@1.0.0",
-      "@std/cli": "jsr:@std/cli@1.0.17",
-      "cases": "https://deno.land/x/case@2.2.0/mod.ts"
-  },
-  "vendor": true
-}
diff --git a/pkgs/test/build-deno-package/binaries/without-npm/deno.lock b/pkgs/test/build-deno-package/binaries/without-npm/deno.lock
deleted file mode 100644
index 3f40f2593aa5..000000000000
--- a/pkgs/test/build-deno-package/binaries/without-npm/deno.lock
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@luca/cases@1.0.0": "1.0.0",
-    "jsr:@std/cli@1.0.17": "1.0.17"
-  },
-  "jsr": {
-    "@luca/cases@1.0.0": {
-      "integrity": "b5f9471f1830595e63a2b7d62821ac822a19e16899e6584799be63f17a1fbc30"
-    },
-    "@std/cli@1.0.17": {
-      "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b"
-    }
-  },
-  "remote": {
-    "https://deno.land/x/case@2.2.0/camelCase.ts": "b9a4cf361a7c9740ecb75e00b5e2c006bd4e5d40e442d26c5f2760286fa66796",
-    "https://deno.land/x/case@2.2.0/constantCase.ts": "c698fc32f00cd267c1684b1d413d784260d7e7798f2bf506803e418497d839b5",
-    "https://deno.land/x/case@2.2.0/dotCase.ts": "03ae55d5635e6a4ca894a003d9297cd9cd283af2e7d761dd3de13663849a9423",
-    "https://deno.land/x/case@2.2.0/headerCase.ts": "3f6c8ab2ab30a88147326bce28a00d1189ec98ab61c83ab72ce79e852afddc4a",
-    "https://deno.land/x/case@2.2.0/lowerCase.ts": "d75eb55cadfa589f9f2a973924a8a209054477d9574da669410f4d817ab25b41",
-    "https://deno.land/x/case@2.2.0/lowerFirstCase.ts": "b001efbf2d715b53d066b22cdbf8eda7f99aa7108e3d12fb02f80d499bae93d9",
-    "https://deno.land/x/case@2.2.0/mod.ts": "28b0b1329c7b18730799ac05627a433d9547c04b9bfb429116247c60edecd97b",
-    "https://deno.land/x/case@2.2.0/normalCase.ts": "085c8b6f9d69283c8b86f2e504d43278c2be8b7e56a3ed8d4a5f395e398bdc29",
-    "https://deno.land/x/case@2.2.0/paramCase.ts": "a234c9c17dfbaddee647b6571c2c90e8f6530123fed26c4546f4063d67c1609f",
-    "https://deno.land/x/case@2.2.0/pascalCase.ts": "4b3ef0a68173871a821d306d4067e8f72d42aeeef1eea6aeab30af6bfa3d7427",
-    "https://deno.land/x/case@2.2.0/pathCase.ts": "330a34b4df365b0291d8e36158235340131730aae6f6add66962ed2d0fbead4a",
-    "https://deno.land/x/case@2.2.0/sentenceCase.ts": "b312cef147a13b58ffdf3c36bf55b33aa8322c91f4aa9b32318f3911bb92327f",
-    "https://deno.land/x/case@2.2.0/snakeCase.ts": "e5ac1e08532ca397aa3150a0a3255d59f63a186d934e5094a8ffd24cbca7f955",
-    "https://deno.land/x/case@2.2.0/swapCase.ts": "bb03742fcf613f733890680ceca1b39b65ed290f36a317fcd47edd517c4e0e1e",
-    "https://deno.land/x/case@2.2.0/titleCase.ts": "c287131ea2c955e67cdd5cf604de96d31a8e2813305759922b9ed27e3be354e7",
-    "https://deno.land/x/case@2.2.0/types.ts": "8e2bd6edaa27c0d1972c0d5b76698564740f37b4d3787d58d1fb5f48de611e61",
-    "https://deno.land/x/case@2.2.0/upperCase.ts": "6cca267bb04d098bf4abf21e42e60c3e68ede89b12e525643c6b6eff3e10de34",
-    "https://deno.land/x/case@2.2.0/upperFirstCase.ts": "b964c2d8d3a85c78cd35f609135cbde99d84b9522a21470336b5af80a37facbd",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseRegexp.ts": "7d9ff02aad4ab6429eeab7c7353f7bcdd6cc5909a8bd3dda97918c8bbb7621ae",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseUpperRegexp.ts": "292de54a698370f90adcdf95727993d09888b7f33d17f72f8e54ba75f7791787",
-    "https://deno.land/x/case@2.2.0/vendor/nonWordRegexp.ts": "c1a052629a694144b48c66b0175a22a83f4d61cb40f4e45293fc5d6b123f927e"
-  },
-  "workspace": {
-    "dependencies": [
-      "jsr:@luca/cases@1.0.0",
-      "jsr:@std/cli@1.0.17"
-    ]
-  }
-}
diff --git a/pkgs/test/build-deno-package/binaries/without-npm/main.ts b/pkgs/test/build-deno-package/binaries/without-npm/main.ts
deleted file mode 100644
index 2bfff532685c..000000000000
--- a/pkgs/test/build-deno-package/binaries/without-npm/main.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { camelCase } from "@luca/cases";
-import { pascalCase } from "cases";
-import { parseArgs } from "@std/cli";
-
-const flags = parseArgs(Deno.args, {
-  string: ["text"],
-});
-
-if (!flags.text) {
-  throw "--text required but not specified";
-}
-
-console.log(camelCase(flags.text));
-console.log(pascalCase(flags.text));
diff --git a/pkgs/test/build-deno-package/default.nix b/pkgs/test/build-deno-package/default.nix
deleted file mode 100644
index dd72e45292ce..000000000000
--- a/pkgs/test/build-deno-package/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs }:
-(pkgs.callPackage ./workspaces { })
-// (pkgs.callPackage ./binaries { })
-// (pkgs.callPackage ./external { })
diff --git a/pkgs/test/build-deno-package/external/default.nix b/pkgs/test/build-deno-package/external/default.nix
deleted file mode 100644
index b8691599e784..000000000000
--- a/pkgs/test/build-deno-package/external/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ fetchFromGitHub, buildDenoPackage }:
-{
-  readma-cli-linux = buildDenoPackage rec {
-    pname = "readma-cli";
-    version = "2.11.0";
-    denoDepsHash = "sha256-ixet3k6OEWfxVnN/V7vk4qDvoXjA+6bU/JjXk76aThE=";
-    src = fetchFromGitHub {
-      owner = "elcoosp";
-      repo = "readma";
-      rev = "${version}";
-      hash = "sha256-FVQTn+r7Ztj02vNvqFZIRIsokWeo1tPfFYffK2tvxjA=";
-    };
-    denoInstallFlags = [
-      "--allow-scripts"
-      "--frozen"
-      "--cached-only"
-      "--entrypoint"
-      "./cli/mod.ts"
-    ];
-    binaryEntrypointPath = "./cli/mod.ts";
-    targetSystem = "x86_64-linux";
-  };
-  fresh-init-cli-linux = buildDenoPackage {
-    pname = "fresh-init-cli";
-    version = "";
-    denoDepsHash = "sha256-WlMv431qTt3gw0w/V7lG8LnLkEt8VW1fNpyclzBwMcw=";
-    src = fetchFromGitHub {
-      owner = "denoland";
-      repo = "fresh";
-      rev = "c7c341b695bad8d0f3e3575e5fa9c82e0fa28bd4";
-      hash = "sha256-bC4akr4Wt4sRqGkgjNuXztW8Q6YBLBsbuIOhsXH8NQU=";
-    };
-    denoWorkspacePath = "./init";
-    binaryEntrypointPath = "./src/mod.ts";
-    targetSystem = "x86_64-linux";
-  };
-  invidious-companion-cli-linux = buildDenoPackage {
-    pname = "invidious-companion-cli";
-    version = "";
-    denoDepsHash = "sha256-sPcvVaVb4VsLI87kiYe3Z3eoXL1uDKwTQMck91cXVnM=";
-    src = fetchFromGitHub {
-      owner = "iv-org";
-      repo = "invidious-companion";
-      rev = "a34c27ff63e51f9e3adc0e8647cd12382f8f1ffe";
-      hash = "sha256-/S8F7G8li12k0objsdFuh+mle6p2mk8zNUUCrG9hgns=";
-    };
-    binaryEntrypointPath = "src/main.ts";
-    denoCompileFlags = [
-      "--include=./src/lib/helpers/youtubePlayerReq.ts"
-      "--include=./src/lib/helpers/getFetchClient.ts"
-      "--allow-import=github.com:443,jsr.io:443,cdn.jsdelivr.net:443,esm.sh:443,deno.land:443"
-      "--allow-net"
-      "--allow-env"
-      "--allow-read"
-      "--allow-sys=hostname"
-      "--allow-write=/var/tmp/youtubei.js"
-    ];
-    denoInstallFlags = [
-      "--allow-scripts"
-      "--frozen"
-      "--cached-only"
-      "--entrypoint"
-      "src/main.ts"
-    ];
-    targetSystem = "x86_64-linux";
-  };
-}
diff --git a/pkgs/test/build-deno-package/shell.nix b/pkgs/test/build-deno-package/shell.nix
deleted file mode 100644
index 4f34fa2db640..000000000000
--- a/pkgs/test/build-deno-package/shell.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
-  pkgs = import ../../../default.nix { };
-in
-pkgs.mkShell {
-  buildInputs = [ pkgs.deno ];
-  DENO_DIR = "./.deno";
-
-  shellHook = '''';
-}
diff --git a/pkgs/test/build-deno-package/workspaces/.gitignore b/pkgs/test/build-deno-package/workspaces/.gitignore
deleted file mode 100644
index cb92b2a7589f..000000000000
--- a/pkgs/test/build-deno-package/workspaces/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deno/
-node_modules/
-vendor/
diff --git a/pkgs/test/build-deno-package/workspaces/default.nix b/pkgs/test/build-deno-package/workspaces/default.nix
deleted file mode 100644
index 01fe1067ae7f..000000000000
--- a/pkgs/test/build-deno-package/workspaces/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ nix-gitignore, buildDenoPackage }:
-rec {
-  sub1 = buildDenoPackage {
-    pname = "test-deno-build-workspaces-sub1";
-    version = "0.1.0";
-    denoDepsHash = "sha256-imraVvtIJqi31aaWv7U1ODVRmOuou1ZR++z7QqnTPr0=";
-    src = nix-gitignore.gitignoreSource [ ] ./.;
-    denoWorkspacePath = "./sub1";
-    extraTaskFlags = [
-      "--text"
-      "sub1"
-    ];
-    denoTaskSuffix = ">out.txt";
-
-    installPhase = ''
-      cp out.txt $out
-    '';
-  };
-  sub2 = buildDenoPackage {
-    pname = "test-deno-build-workspaces-sub2";
-    version = "0.1.0";
-    inherit (sub1) denoDeps src;
-    denoWorkspacePath = "./sub2";
-    extraTaskFlags = [
-      "--text"
-      "sub2"
-    ];
-    denoTaskSuffix = ">out.txt";
-    installPhase = ''
-      cp out.txt $out
-    '';
-  };
-  sub1Binary = buildDenoPackage {
-    pname = "test-deno-build-workspaces-sub1-binary";
-    version = "0.1.0";
-    inherit (sub1) denoDeps src;
-    denoWorkspacePath = "./sub1";
-    binaryEntrypointPath = "./main.ts";
-  };
-}
diff --git a/pkgs/test/build-deno-package/workspaces/deno.json b/pkgs/test/build-deno-package/workspaces/deno.json
deleted file mode 100644
index 86437ea04197..000000000000
--- a/pkgs/test/build-deno-package/workspaces/deno.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "workspace":[
-    "./sub1",
-    "./sub2"
-  ],
-  "vendor": true
-}
diff --git a/pkgs/test/build-deno-package/workspaces/deno.lock b/pkgs/test/build-deno-package/workspaces/deno.lock
deleted file mode 100644
index e9007eb56670..000000000000
--- a/pkgs/test/build-deno-package/workspaces/deno.lock
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@luca/cases@1.0.0": "1.0.0",
-    "jsr:@std/cli@1.0.17": "1.0.17",
-    "npm:cowsay@1.6.0": "1.6.0"
-  },
-  "jsr": {
-    "@luca/cases@1.0.0": {
-      "integrity": "b5f9471f1830595e63a2b7d62821ac822a19e16899e6584799be63f17a1fbc30"
-    },
-    "@std/cli@1.0.17": {
-      "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b"
-    }
-  },
-  "npm": {
-    "ansi-regex@3.0.1": {
-      "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
-    },
-    "ansi-regex@5.0.1": {
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles@4.3.0": {
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": [
-        "color-convert"
-      ]
-    },
-    "camelcase@5.3.1": {
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "cliui@6.0.0": {
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dependencies": [
-        "string-width@4.2.3",
-        "strip-ansi@6.0.1",
-        "wrap-ansi"
-      ]
-    },
-    "color-convert@2.0.1": {
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": [
-        "color-name"
-      ]
-    },
-    "color-name@1.1.4": {
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "cowsay@1.6.0": {
-      "integrity": "sha512-8C4H1jdrgNusTQr3Yu4SCm+ZKsAlDFbpa0KS0Z3im8ueag+9pGOf3CrioruvmeaW/A5oqg9L0ar6qeftAh03jw==",
-      "dependencies": [
-        "get-stdin",
-        "string-width@2.1.1",
-        "strip-final-newline",
-        "yargs"
-      ],
-      "bin": true
-    },
-    "decamelize@1.2.0": {
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
-    },
-    "emoji-regex@8.0.0": {
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "find-up@4.1.0": {
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": [
-        "locate-path",
-        "path-exists"
-      ]
-    },
-    "get-caller-file@2.0.5": {
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-stdin@8.0.0": {
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
-    },
-    "is-fullwidth-code-point@2.0.0": {
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
-    },
-    "is-fullwidth-code-point@3.0.0": {
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "locate-path@5.0.0": {
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": [
-        "p-locate"
-      ]
-    },
-    "p-limit@2.3.0": {
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": [
-        "p-try"
-      ]
-    },
-    "p-locate@4.1.0": {
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": [
-        "p-limit"
-      ]
-    },
-    "p-try@2.2.0": {
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "path-exists@4.0.0": {
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "require-directory@2.1.1": {
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "require-main-filename@2.0.0": {
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "set-blocking@2.0.0": {
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-    },
-    "string-width@2.1.1": {
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dependencies": [
-        "is-fullwidth-code-point@2.0.0",
-        "strip-ansi@4.0.0"
-      ]
-    },
-    "string-width@4.2.3": {
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": [
-        "emoji-regex",
-        "is-fullwidth-code-point@3.0.0",
-        "strip-ansi@6.0.1"
-      ]
-    },
-    "strip-ansi@4.0.0": {
-      "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
-      "dependencies": [
-        "ansi-regex@3.0.1"
-      ]
-    },
-    "strip-ansi@6.0.1": {
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": [
-        "ansi-regex@5.0.1"
-      ]
-    },
-    "strip-final-newline@2.0.0": {
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "which-module@2.0.1": {
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
-    },
-    "wrap-ansi@6.2.0": {
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": [
-        "ansi-styles",
-        "string-width@4.2.3",
-        "strip-ansi@6.0.1"
-      ]
-    },
-    "y18n@4.0.3": {
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
-    "yargs-parser@18.1.3": {
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dependencies": [
-        "camelcase",
-        "decamelize"
-      ]
-    },
-    "yargs@15.4.1": {
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dependencies": [
-        "cliui",
-        "decamelize",
-        "find-up",
-        "get-caller-file",
-        "require-directory",
-        "require-main-filename",
-        "set-blocking",
-        "string-width@4.2.3",
-        "which-module",
-        "y18n",
-        "yargs-parser"
-      ]
-    }
-  },
-  "remote": {
-    "https://deno.land/x/case@2.2.0/camelCase.ts": "b9a4cf361a7c9740ecb75e00b5e2c006bd4e5d40e442d26c5f2760286fa66796",
-    "https://deno.land/x/case@2.2.0/constantCase.ts": "c698fc32f00cd267c1684b1d413d784260d7e7798f2bf506803e418497d839b5",
-    "https://deno.land/x/case@2.2.0/dotCase.ts": "03ae55d5635e6a4ca894a003d9297cd9cd283af2e7d761dd3de13663849a9423",
-    "https://deno.land/x/case@2.2.0/headerCase.ts": "3f6c8ab2ab30a88147326bce28a00d1189ec98ab61c83ab72ce79e852afddc4a",
-    "https://deno.land/x/case@2.2.0/lowerCase.ts": "d75eb55cadfa589f9f2a973924a8a209054477d9574da669410f4d817ab25b41",
-    "https://deno.land/x/case@2.2.0/lowerFirstCase.ts": "b001efbf2d715b53d066b22cdbf8eda7f99aa7108e3d12fb02f80d499bae93d9",
-    "https://deno.land/x/case@2.2.0/mod.ts": "28b0b1329c7b18730799ac05627a433d9547c04b9bfb429116247c60edecd97b",
-    "https://deno.land/x/case@2.2.0/normalCase.ts": "085c8b6f9d69283c8b86f2e504d43278c2be8b7e56a3ed8d4a5f395e398bdc29",
-    "https://deno.land/x/case@2.2.0/paramCase.ts": "a234c9c17dfbaddee647b6571c2c90e8f6530123fed26c4546f4063d67c1609f",
-    "https://deno.land/x/case@2.2.0/pascalCase.ts": "4b3ef0a68173871a821d306d4067e8f72d42aeeef1eea6aeab30af6bfa3d7427",
-    "https://deno.land/x/case@2.2.0/pathCase.ts": "330a34b4df365b0291d8e36158235340131730aae6f6add66962ed2d0fbead4a",
-    "https://deno.land/x/case@2.2.0/sentenceCase.ts": "b312cef147a13b58ffdf3c36bf55b33aa8322c91f4aa9b32318f3911bb92327f",
-    "https://deno.land/x/case@2.2.0/snakeCase.ts": "e5ac1e08532ca397aa3150a0a3255d59f63a186d934e5094a8ffd24cbca7f955",
-    "https://deno.land/x/case@2.2.0/swapCase.ts": "bb03742fcf613f733890680ceca1b39b65ed290f36a317fcd47edd517c4e0e1e",
-    "https://deno.land/x/case@2.2.0/titleCase.ts": "c287131ea2c955e67cdd5cf604de96d31a8e2813305759922b9ed27e3be354e7",
-    "https://deno.land/x/case@2.2.0/types.ts": "8e2bd6edaa27c0d1972c0d5b76698564740f37b4d3787d58d1fb5f48de611e61",
-    "https://deno.land/x/case@2.2.0/upperCase.ts": "6cca267bb04d098bf4abf21e42e60c3e68ede89b12e525643c6b6eff3e10de34",
-    "https://deno.land/x/case@2.2.0/upperFirstCase.ts": "b964c2d8d3a85c78cd35f609135cbde99d84b9522a21470336b5af80a37facbd",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseRegexp.ts": "7d9ff02aad4ab6429eeab7c7353f7bcdd6cc5909a8bd3dda97918c8bbb7621ae",
-    "https://deno.land/x/case@2.2.0/vendor/camelCaseUpperRegexp.ts": "292de54a698370f90adcdf95727993d09888b7f33d17f72f8e54ba75f7791787",
-    "https://deno.land/x/case@2.2.0/vendor/nonWordRegexp.ts": "c1a052629a694144b48c66b0175a22a83f4d61cb40f4e45293fc5d6b123f927e"
-  },
-  "workspace": {
-    "members": {
-      "sub1": {
-        "dependencies": [
-          "jsr:@std/cli@1.0.17",
-          "npm:cowsay@1.6.0"
-        ]
-      },
-      "sub2": {
-        "dependencies": [
-          "jsr:@luca/cases@1.0.0",
-          "jsr:@std/cli@1.0.17",
-          "npm:cowsay@1.6.0"
-        ]
-      }
-    }
-  }
-}
diff --git a/pkgs/test/build-deno-package/workspaces/sub1/deno.json b/pkgs/test/build-deno-package/workspaces/sub1/deno.json
deleted file mode 100644
index dc00086de60d..000000000000
--- a/pkgs/test/build-deno-package/workspaces/sub1/deno.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "tasks": {
-        "build": "deno run --allow-all main.ts"
-    },
-    "imports": {
-        "@std/cli": "jsr:@std/cli@1.0.17",
-        "cowsay": "npm:cowsay@1.6.0",
-        "cases": "https://deno.land/x/case@2.2.0/mod.ts"
-    }
-}
diff --git a/pkgs/test/build-deno-package/workspaces/sub1/main.ts b/pkgs/test/build-deno-package/workspaces/sub1/main.ts
deleted file mode 100644
index 7164d1aeecba..000000000000
--- a/pkgs/test/build-deno-package/workspaces/sub1/main.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { say } from "cowsay";
-import { pascalCase } from "cases";
-import { parseArgs } from "@std/cli";
-
-const flags = parseArgs(Deno.args, {
-  string: ["text"],
-});
-
-if (!flags.text) {
-  throw "--text required but not specified";
-}
-
-console.log(pascalCase(say({ text: flags.text })));
diff --git a/pkgs/test/build-deno-package/workspaces/sub2/deno.json b/pkgs/test/build-deno-package/workspaces/sub2/deno.json
deleted file mode 100644
index a7d350d391fc..000000000000
--- a/pkgs/test/build-deno-package/workspaces/sub2/deno.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "tasks": {
-        "build": "deno run --allow-all main.ts"
-    },
-    "imports": {
-        "@luca/cases": "jsr:@luca/cases@1.0.0",
-        "@std/cli": "jsr:@std/cli@1.0.17",
-        "cowsay": "npm:cowsay@1.6.0"
-    }
-}
diff --git a/pkgs/test/build-deno-package/workspaces/sub2/main.ts b/pkgs/test/build-deno-package/workspaces/sub2/main.ts
deleted file mode 100644
index cb1806f1bcd6..000000000000
--- a/pkgs/test/build-deno-package/workspaces/sub2/main.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { camelCase } from "@luca/cases";
-import { say } from "cowsay";
-import { parseArgs } from "@std/cli";
-
-const flags = parseArgs(Deno.args, {
-  string: ["text"],
-});
-
-if (!flags.text) {
-  throw "--text required but not specified";
-}
-
-console.log(camelCase(say({ text: flags.text })));
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index cf6b6628847c..a743d2277f9b 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -225,5 +225,5 @@ with pkgs;
 
   rust-hooks = recurseIntoAttrs (callPackages ../build-support/rust/hooks/test { });
 
-  build-deno-package = callPackage ./build-deno-package { };
+  setup-hooks = recurseIntoAttrs (callPackages ../build-support/setup-hooks/tests { });
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
index ad1aae82f170..3dffa53af8ff 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix
@@ -42,6 +42,12 @@ stdenv.mkDerivation rec {
   rimeDataDrv = symlinkJoin {
     name = "ibus-rime-data";
     paths = rimeDataPkgs;
+    postBuild = ''
+      mkdir -p $out/share/rime-data
+
+      # Ensure default.yaml exists
+      [ -e "$out/share/rime-data/default.yaml" ] || touch "$out/share/rime-data/default.yaml"
+    '';
   };
 
   postInstall = ''
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 06cef5d1288d..1edb287d4121 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -104,7 +104,6 @@ buildPythonPackage rec {
     '';
     license = licenses.publicDomain;
     maintainers = with maintainers; [
-      bluescreen303
       fpletz
     ];
     platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
index 5ff60bbf9c1b..d4cc448a07f5 100644
--- a/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libexpr/package.nix
@@ -63,13 +63,6 @@ mkMesonLibrary (finalAttrs: {
     (lib.mesonEnable "gc" enableGC)
   ];
 
-  env = {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
index e005000a737b..e08658a32761 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
@@ -56,13 +56,6 @@ mkMesonLibrary (finalAttrs: {
       (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
     ];
 
-  env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
diff --git a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
index 3e96aa0660c8..5b1723b8ac2d 100644
--- a/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libutil/package.nix
@@ -46,13 +46,6 @@ mkMesonLibrary (finalAttrs: {
     (lib.mesonEnable "cpuid" stdenv.hostPlatform.isx86_64)
   ];
 
-  env = lib.optionalAttrs (!lib.versionAtLeast version "2.27") {
-    # Needed for Meson to find Boost.
-    # https://github.com/NixOS/nixpkgs/issues/86131.
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   meta = {
     platforms = lib.platforms.unix ++ lib.platforms.windows;
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8cd0a0765fb1..8f7e5b0cd269 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1045,6 +1045,7 @@ mapAliases {
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
   libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
+  libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
   libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
   libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
@@ -1986,6 +1987,7 @@ mapAliases {
   ### U ###
 
   uade123 = uade; # Added 2022-07-30
+  uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17
   ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17
   ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40274c1438c4..49eddc32c1d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3626,12 +3626,6 @@ with pkgs;
 
   node2nix = nodePackages.node2nix;
 
-  buildDenoPackage = callPackage ../build-support/deno/build-deno-package { };
-
-  inherit (callPackages ../build-support/deno/fetch-deno-deps { }) fetchDenoDeps;
-
-  denoHooks = callPackage ../build-support/deno/build-deno-package/hooks { };
-
   kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { };
 
   ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { };
@@ -3875,6 +3869,7 @@ with pkgs;
   inherit (callPackages ../applications/networking/cluster/nomad { })
     nomad
     nomad_1_9
+    nomad_1_10
     ;
 
   nomacs-qt6 = nomacs.override { qtVersion = 6; };
@@ -8856,7 +8851,6 @@ with pkgs;
       stdenv = gccStdenv; # Required for darwin
     })
     libprom
-    libpromhttp
     ;
 
   libpulsar = callPackage ../development/libraries/libpulsar {
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5fa6bf77e42b..1847580e4306 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -389,6 +389,8 @@ lib.makeScope pkgs.newScope (
 
         swoole = callPackage ../development/php-packages/swoole { };
 
+        systemd = callPackage ../development/php-packages/systemd { };
+
         tideways = callPackage ../development/php-packages/tideways { };
 
         uuid = callPackage ../development/php-packages/uuid { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f35c9a1679fc..acf4ba69b467 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -93,7 +93,6 @@ self: super: with self; {
 
   adios2 = toPythonModule (
     pkgs.adios2.override {
-      python3 = python;
       python3Packages = self;
       pythonSupport = true;
     }
@@ -9380,6 +9379,8 @@ self: super: with self; {
 
   mplleaflet = callPackage ../development/python-modules/mplleaflet { };
 
+  mpltoolbox = callPackage ../development/python-modules/mpltoolbox { };
+
   mpmath = callPackage ../development/python-modules/mpmath { };
 
   mpris-server = callPackage ../development/python-modules/mpris-server { };
@@ -11529,6 +11530,8 @@ self: super: with self; {
 
   ploomber-extension = callPackage ../development/python-modules/ploomber-extension { };
 
+  plopp = callPackage ../development/python-modules/plopp { };
+
   plotext = callPackage ../development/python-modules/plotext { };
 
   plotille = callPackage ../development/python-modules/plotille { };
@@ -15842,6 +15845,8 @@ self: super: with self; {
 
   scim2-tester = callPackage ../development/python-modules/scim2-tester { };
 
+  scipp = callPackage ../development/python-modules/scipp { };
+
   scipy = callPackage ../development/python-modules/scipy { };
 
   scmrepo = callPackage ../development/python-modules/scmrepo { };
@@ -18764,6 +18769,10 @@ self: super: with self; {
 
   unique-log-filter = callPackage ../development/python-modules/unique-log-filter { };
 
+  units-llnl = callPackage ../development/python-modules/units-llnl {
+    inherit (pkgs) units-llnl;
+  };
+
   unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { };
 
   unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };